Some selection overhaul