Fixed output filename to be general