final refactoring, wasnt about to connect for to teams generated