ContinuationCounter works now.
Some code clean up.