Get rid of "matrix", manipulate code directly