Include diamond lattice and generalize random
vectors.