Updated with analytics