Removed numeric.h and added grid.h