many changes to the email collector