see other commit msg
still need to add simplificatin of formulas