Update - Now works with thumbnails