More style
Updated events to rewrite email addresses