Now using path rather than directory + file name