Improved for google analytics.