Added transformation to Marek's preferred format