Added better attachments