Refactored selection watch