Merged in typedmatrix