Changes to the way the output is sent out (by file name now)