Waiting on answer to get mailer working. Added agent fields.