Tweaks to observer to decrease dependency