Requested changes, fix selection problem