updated formulas