Redone the overlay neighbour set