Updated with new analytics