added rest of formulas