Second commit for teamd and tournaments