Added a better counter.