check-and-go and matrix updated.
Matrix should be right.
Verify C-and-G