Reingeniered, one step less, converged form more stable
a bit of cleanup