Implemented new selection mechanism.