Redefined my Matrix class