change proj for pictures
merge conflict