Fix formulas for my requirements