More context management, small change in yep
First rollout of context management