Tried to fix rotation problem.... failed
Revert "Tried to fix rotation problem.... failed"

This reverts commit 4a8afbb5bd171bf312c54cf9e3caf07ac97db477.
Added neighbor detection