Changed selection method