Updated to version 2.3.x and made YEqns conservative