Add fields to edit
Merge branch 'pete'