changed analytics to track generic events