edits from Steve