Fixed bugs for formula-based calculations
Uncomment dependencies