Email update, really need to clean this up