Improved Neighborhood lookup.