simplified Morphism; more changes to Match