Altered analytics to use new method