Changed to dynamic neighbor buckets