More progress on attachments