reworked selection system