edits from Jonathan