rework on google analytics setup