Updated for Analytics