Minor modification to use better output file name