neighbor change bug
new implementation
Merge pull request #3 from MattFlaig/s5

S5