Updated grid to array struct