changed background to picture
resolve merge conflict
refactored to camelCase