Dave's changes from 8/18 emails