adding city image functionality
after merge conflict