AC-FOVE: Counting Formula refactoring

* Kept OldCountingFormula with old code so the code does not break