Updated email system