updated with few more formulas