Added some convergence criteria