updated with analytics