added real images
fixed merge conflicts