Changing first selection to work in new style