Adding in output path formatting