Feature/mixpanel update 28 7