Updated grid structure