Incorporated comments from Mike StJohns.