Updates to 2-step unfolding
Updating 2-step unfolding