Tweaks to new context