new version
requires symlink, but less hard-coded