Added coded for email requrement