Incremental grids fixes
Incremental grids fixes