Final Changes to output format