Went back one step to working analytics code