Refactored neighbour design.