Matrices rework