more format changes to match original