Fix everything but the email sending