Reformat, add code to wait for ring convergence.