merged equationator changes