UPDATED analytics