Changed addNeighbor() to addNeighborOrSurrogateNeighbor()