Made EquationGenerator to work