Added neighbour extraction