#6 fixing where analytics are called