Add good convergence criteria