Changes to tournament_stage and tournament controller