Correct to new output format