Merged addNeighbours back to original method