added switch and google analytics