Updated selection system