Updated Team controller