Finalized the new format