Changed selection to be more readable