re-structured the grid