Added timer and changed convergence criteria.