draft 2 edits, incorporate comments