Updated FormulaAnalysis