changes to teams controller on user side - stability etc