updated design of match

Bugs still the same