TeamController Modification