Edits for Brian's comments