Finally fixed email with Evan and Scott's help fk yeah
Merge branch 'fixed_branch'