SelectionCtrl modified