Modifs on grid.h