refactored /neighbours and /add_random_neighbours