Edits from Jeff from August.