Update21- Fixing Grids