changed the way to select