updated formulas

Updated