better find logic