Update and rename Matrix to Matrix2