Improved FindNeighbor