modification to file_path handling