Added Equation handling.