modified analytics tracking, util, core file