add matrixId and stuff around