Changed to use new matrix identity convention