Forgot changes
External changes
More fixes
Use the initial path