Improvement in CollectNeighbors