Reorganize the matrix, it was just so hard to read