Updates to Email Controller etc.