JM & Mark's suggested edits