Changed analytics code