Equation improvements