Slight Change to Email Functionality