G3 analytics, more images
Fixed conflicts