Lots of changes
removed attachments.