Edits from 7/17 meeting