Tweaks from bobby