Optimize team platter a little more