Removed/Changed Email
Merge origin/master
Added with()