Model-rework to pre-branch state