removed all the redundant codes where team_assignment? is checked and changed the corresponding views