update
update
fixed merge conflicts
fixed formulation errors