Added unit selection