working on emails
merge conflicts
fixed weird characters