Begin swap to new format