consolidating/fixing analytics