Modified for Email collection