udpate 'set_up_matches', 'match_handler'