More changes to new format