edits as discussed on 11/3