update to matchup/round models