Changes to select a unit