Fixed discrete. Added 1D neighbours