Update to grid.h