added fixed analytics