working on thumbnails
conflicts