consolidating to new format