Changed input/output format