working on more robust target finding