refactor with match_day