Updated some of the reposition of the matrix elements