update the formulas so that it is consistence in modeling part