Switching to riemann-hs