refactored match code to include updates
removed unnecessary commit