edits on all for draft 1