moved matchup id to type long