updated wrapper with google analytics