Updated working directory locations code.