updating branch to current
fixing analytics
fixing analytics