Imrpovements to seleciton mechanism.
6 files changed