Redo schema with email
Merge branch 'erik'