changing match
tweaked and commented good things