Moved from team1 and team2 to player.team