updated original to new format