Dave edits from 7/24