Adjusted file paths, final version