BEst neighbour fix