get rid of matrix, because we have things we can only do once (like t…

get rid of matrix, because we have things we can only do once (like t… #7