#1 . More changes to fix the paths