Almost fixed. Most of matrix is correct.