Tweaks from Bob