Adding FindNeighbor