TagsTeam improvements

TAG:team improvements