even better handling of symlinks