Working on the email issue :)