updated with email service