hu hu
trying to merge
attempted to fix the email sending
attempted to fix email send