Added convergence criteria