Edits from Dr. Goldthorpe