Tweaks from Brian