Mark's comments and more edits from Sylvia