Daily Commit [#7]

- Neighbors fixes