Modified for attachments