updating to introduce formulation in 2 steps