Re-enabled neighbor code