refactoring to allow new teams smooth adding