[changes] Proper stats tracking