Got rid of the matrix