added convergence and mixing stuff