Commit for 2.3-4 (Email Assignment)