Updates to Analytics. Still Calendar Issues