Started BuildEmail logic update