Pablo: validmatrix replaced with new indendations