Tweaks for Scott Baker