Fine tuned privacy
Refactored counting functionality
Fine tuned count and hooked it wherever required