Update: improved single unit selection