added rest of pictures
merge conflict