SelectionController rewritten some more