Edits for new draft