edits from Steve in 5C and 6