Made all arrays use new format to increase space available