Changes for emails