improved myteam handling