Updates for new JoinTeam func