Adding code for attachments & removing unnecessary file...