Work on notification emails