Worked on the comment attachments too