Updated to the new matrix