TeamManager partially fixed