More changes to team select

…getting there.