Fixing neighbors hell

WTF xD :hankey: