Refactored selection