diff --git a/.gitignore b/.gitignore
index 56923c8..8cdd5d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /node_modules/
 /coverage-report/
+.idea
diff --git a/.idea/google-analytics.iml b/.idea/google-analytics.iml
deleted file mode 100644
index c956989..0000000
--- a/.idea/google-analytics.iml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index 28a804d..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 191311c..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/google-analytics.iml" filepath="$PROJECT_DIR$/.idea/google-analytics.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index c8dd8fd..0000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ChangeListManager">
-    <list default="true" id="667d5fdb-ef24-4cd2-a1f4-7909b3b39aca" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/Classes/Loader.php" beforeDir="false" afterPath="$PROJECT_DIR$/Classes/Loader.php" afterDir="false" />
-    </list>
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="FUSProjectUsageTrigger">
-    <session id="416417787">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.open.time.0" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Markdown" value="1" />
-          <entry key="PHP" value="4" />
-          <entry key="PLAIN_TEXT" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="PHP" value="164" />
-          <entry key="PLAIN_TEXT" value="31" />
-        </counts>
-      </usages-collector>
-    </session>
-    <session id="-1841760033">
-      <usages-collector id="statistics.lifecycle.project">
-        <counts>
-          <entry key="project.closed" value="1" />
-          <entry key="project.open.time.1" value="1" />
-          <entry key="project.opened" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.edit">
-        <counts>
-          <entry key="PHP" value="247" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="PHP" value="2" />
-        </counts>
-      </usages-collector>
-    </session>
-  </component>
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
-  </component>
-  <component name="FindInProjectRecents">
-    <findStrings>
-      <find>register_</find>
-      <find>register_public_scripts</find>
-    </findStrings>
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="IdeDocumentHistory">
-    <option name="CHANGED_PATHS">
-      <list>
-        <option value="$PROJECT_DIR$/wk-ga.php" />
-        <option value="$PROJECT_DIR$/readme.txt" />
-        <option value="$PROJECT_DIR$/Classes/Plugin.php" />
-        <option value="$PROJECT_DIR$/../test/wp-content/plugins/wk-google-analytics/Classes/Loader.php" />
-        <option value="$PROJECT_DIR$/Classes/Loader.php" />
-      </list>
-    </option>
-  </component>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsGulpfileManager">
-    <detection-done>true</detection-done>
-    <sorting>DEFINITION_ORDER</sorting>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="y" value="323" />
-    <option name="width" value="800" />
-    <option name="height" value="538" />
-  </component>
-  <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
-    <panes>
-      <pane id="ProjectPane">
-        <subPane>
-          <expand>
-            <path>
-              <item name="wk-google-analytics" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wk-google-analytics" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="wk-google-analytics" type="b2602c69:ProjectViewProjectNode" />
-              <item name="wk-google-analytics" type="462c0819:PsiDirectoryNode" />
-              <item name="Classes" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-    </panes>
-  </component>
-  <component name="PropertiesComponent">
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
-    <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
-    <property name="nodejs_npm_path_reset_for_default_project" value="true" />
-  </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="667d5fdb-ef24-4cd2-a1f4-7909b3b39aca" name="Default Changelist" comment="" />
-      <created>1554824927820</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1554824927820</updated>
-      <workItem from="1554824929023" duration="772000" />
-      <workItem from="1554825847249" duration="4081000" />
-    </task>
-    <servers />
-  </component>
-  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="4853000" />
-  </component>
-  <component name="ToolWindowManager">
-    <frame x="0" y="23" width="2560" height="1353" extended-state="6" />
-    <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25178713" />
-      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info id="Favorites" order="2" side_tool="true" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" />
-      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
-      <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Quokka" order="8" />
-      <window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Terminal" order="11" />
-      <window_info anchor="bottom" id="Event Log" order="12" side_tool="true" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
-      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
-      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Copy/Paste" order="3" />
-      <window_info anchor="right" id="Database" order="4" />
-    </layout>
-  </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
-  </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="75">
-            <caret line="5" lean-forward="true" selection-start-line="5" selection-end-line="5" />
-          </first_editor>
-          <second_editor />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/readme.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" column="28" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/wk-ga.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="75">
-          <caret line="5" column="18" selection-start-line="5" selection-start-column="18" selection-end-line="5" selection-end-column="18" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/../test/wp-content/plugins/wk-google-analytics/Classes/Loader.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="104" column="38" selection-start-line="104" selection-start-column="38" selection-end-line="104" selection-end-column="38" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Classes/Loader.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="415">
-          <caret line="103" column="7" lean-forward="true" selection-start-line="103" selection-start-column="7" selection-end-line="103" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/Classes/Plugin.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="620">
-          <caret line="51" column="61" lean-forward="true" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
-        </state>
-      </provider>
-    </entry>
-  </component>
-</project>
\ No newline at end of file
diff --git a/Classes/Loader.php b/Classes/Loader.php
index 2a53cd9..c1b2c6d 100644
--- a/Classes/Loader.php
+++ b/Classes/Loader.php
@@ -5,19 +5,6 @@
 class Loader
 {
 
-	/**
-	 * Returns whether the current request should be tracked or not
-	 *
-	 * @since 1.2
-	 * @return boolean
-	 *
-	 */
-	function should_track_visit()
-	{
-		return (!is_user_logged_in() || get_option('track_logged_in'));
-	}
-
-
 	/**
 	 * Returns if the cookie is present
 	 *
@@ -29,13 +16,34 @@ function render_script()
 	{
 		ob_start();
 		?>
+		<script>
 		function hasWKGoogleAnalyticsCookie() {
 		return (new RegExp('wp_wk_ga_untrack_' + document.location.hostname)).test(document.cookie);
 		}
+		</script>
 		<?php
 		return ob_get_clean();
 	}
 
+	/** 
+	* Outputs a js function that allows a cached page to check if the user should be tracked
+	*/
+	public function output_should_track_js_function(){
+		?>
+		<script>
+		function shouldTrack(){
+			var trackLoggedIn = <?php echo (get_option('track_logged_in') ? 'true' : 'false'); ?>;
+			var loggedIn = jQuery("body").hasClass("logged-in");
+			if(!loggedIn){
+				return true;
+			} else if( trackLoggedIn ) {
+				return true;
+			}
+			return false;
+		}
+		</script>
+		<?php
+	}
 
 	/**
 	 * Outputs the Google Tag Manager script tag if necessary
@@ -46,11 +54,13 @@ function hasWKGoogleAnalyticsCookie() {
 	function google_tag_manager_script()
 	{
 		ob_start();
-		if ($this->should_track_visit() && get_option('ga_use_tag_manager')) {
+		if (get_option('ga_use_tag_manager')) {
 			$TAG_MANAGER_ID = get_option('ga_tag_manager_id');
 
+			$this->output_should_track_js_function();
 			?>
-			if (!hasWKGoogleAnalyticsCookie()) {
+			<script>
+			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Tag Manager
 			(function (w, d, s, l, i) {
 			w[l] = w[l] || [];
@@ -66,6 +76,7 @@ function google_tag_manager_script()
 			f.parentNode.insertBefore(j, f);
 			})(window, document, 'script', 'dataLayer', '<?php echo $TAG_MANAGER_ID; ?>');
 			}
+			</script>
 			<?php
 		}
 		return ob_get_clean();
@@ -81,7 +92,7 @@ function google_tag_manager_script()
 	function google_tag_manager_noscript()
 	{
 		ob_start();
-		if ($this->should_track_visit() && get_option('ga_use_tag_manager')) {
+		if (get_option('ga_use_tag_manager')) {
 			$TAG_MANAGER_ID = get_option('ga_tag_manager_id');
 			?>
 			<noscript>
@@ -105,12 +116,13 @@ function google_tag_manager_noscript()
 	function google_analytics_script()
 	{
 		ob_start();
-		if ($this->should_track_visit() && !get_option('ga_use_tag_manager')) {
+		if (!get_option('ga_use_tag_manager')) {
 			$GA_TRACKING_CODE = get_option('ga_tracking_code');
 			$ANONYMIZE_IP = (get_option('ga_anonymize_ip') !== false) ? (boolean)get_option('ga_anonymize_ip') : true;
+			$this->output_should_track_js_function(); 
 			?>
-
-			if (!hasWKGoogleAnalyticsCookie()) {
+			<script>
+			if (!hasWKGoogleAnalyticsCookie() && shouldTrack()) {
 			//Google Analytics
 			(function (i, s, o, g, r, a, m) {
 			i['GoogleAnalyticsObject'] = r;
@@ -135,7 +147,7 @@ function google_analytics_script()
 
 			ga('send', 'pageview');
 			}
-
+			</script>
 			<?php
 		}
 		return ob_get_clean();
@@ -147,20 +159,13 @@ function google_analytics_script()
 	function register_ga_scripts()
 	{
 		//cookie function
-		wp_register_script('wk-cookie-check', '');
-		wp_enqueue_script('wk-cookie-check');
-		wp_add_inline_script('wk-cookie-check', $this->render_script());
+		echo $this->render_script();
 
 		//Google Analytics script in <head>
-		wp_register_script('wk-tag-manager-script', '');
-		wp_enqueue_script('wk-tag-manager-script');
-		wp_add_inline_script('wk-tag-manager-script', $this->google_tag_manager_script());
+		echo $this->google_tag_manager_script();
 
 		//Google Analytics script in <head>
-		wp_register_script('wk-analytics-script', '');
-		wp_enqueue_script('wk-analytics-script');
-		wp_add_inline_script('wk-analytics-script', $this->google_analytics_script());
-
+		echo $this->google_analytics_script();
 	}
 
 	/**
@@ -201,5 +206,4 @@ function load_admin_styles($hook)
 		wp_enqueue_style('custom-admin-styles', plugins_url(plugin_basename(WK_GOOGLE_ANALYTICS_DIR)) . '/css/admin-styles.css');
 
 	}
-
 }
diff --git a/Classes/Plugin.php b/Classes/Plugin.php
index 4a7cd2b..494afdd 100644
--- a/Classes/Plugin.php
+++ b/Classes/Plugin.php
@@ -7,7 +7,6 @@ class Plugin
 
 	public function run()
 	{
-
 		//i18n
 		add_action('plugins_loaded', array($this, 'load_textdomain'));
 
@@ -31,12 +30,11 @@ public function run()
 		add_action('wp_enqueue_scripts', array($this->loader, 'register_public_scripts'));
 		add_action('admin_enqueue_scripts', array($this->loader, 'register_public_scripts'));
 
-		add_action('wp_enqueue_scripts', array($this->loader, 'register_ga_scripts'));
+		add_action('wp_head', array($this->loader, 'register_ga_scripts'));
 
 		//Google Tag Manager noscript footer
 		add_action('wp_footer', array($this->loader, 'google_tag_manager_noscript'));
 
-
 		//additional links to admin plugin page
 		add_filter('plugin_row_meta', array($this, 'additional_admin_information_links'), 10, 2);
 		add_filter('plugin_action_links_' . plugin_basename(__FILE__), array($this, 'additional_admin_action_links'));
diff --git a/readme.txt b/readme.txt
index 377d661..16eae41 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,10 +1,10 @@
-=== Google Analytics ===
+=== Google Analytics and Google Tag Manager===
 Contributors: webkinder
 Tags: google analytics, tracking code, analytics, anonymization, anonymize, anonymizeIp, cookie, Datenschutz, ga, gaoptout, google, googleanalytics, google tag manager, gtm, Datenschutz, datenschutzkonform, script, snippet
 Requires at least: 3.0
-Requires PHP: 5.4
-Tested up to: 4.9.6
-Stable tag: 1.7.2
+Requires PHP: 5.6
+Tested up to: 5.1.0
+Stable tag: 1.7.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html