Replace the jagged array used for the fields with normal two dimensional array