Some updates to neighborhood