Changes to include new u' condition + convergence correction