fixed analytics here