Improved target finding