Updated team controller