moved notification and email