Updated selection logic