Updated Matrix3 and 4