new version without thumbs;some cleanup