Changed how output file is named