refactored to not require symlinking