Brian's change for UnitSelection