Jim's edits from the comments from JO