edits 6 and 7