Tweaks to post #1