new email list
added information from PC
Cleaned up merge conflict