Cleaned up counter tracking
Went back to old way of counting incrementally