Fixing segmentation into neighborhoods, etc.