new version with relative paths