Improved RiemannSolver