Added GRID_WIDTH and GRID_HEIGHT