#6 fixing where analytics are called
Merge branch '6-analytics'