Change of matrix_type to matrix (not compiled yet)