Update with minor tweaks from Brian