Updated neighbour check