Simplify goThroughNeighbours to fix a pretty annoying bug
Fix merge with Steffi