Edits from Mark and Greg