Adding shift-select capability