should be passing along the attachments everywhere now?