Changes in design and also in mail sending