edits for rev 1
merge