Updated: Matrix.java