updated with new Analytics