Rebuilt the selection system