Changed the grid structure