Add 6 and 7, edits