merged from ba/tournament_crud
mend