Adding more neighbor notifies to help with #256