edits from Mark