More changes to find Neighbors