Changes for multiple c
Changes for team controller