Back to the old output format