Made edits discussed on 8/11