Matrices upgrade