Changed some output file format