added two-tiered neighborhood rule support