Changed output files and format