Added parameter for choosing lattice geometry