This branch is not using a external class to keep track of the counters
Fixed the issue with using external class to save info