Changes for multiple emails