Added 25h7, 69-72 to allow 12x6 grids