implemented Mark's working_directory suggestion