Adding comments back, temp-fix for relative paths