new block added for emails, plus modifications