Improved team selection a bit.