added analytics
removed takan