Matchup reset handling added.