picture Attachment fully working
Minor changes