diff --git a/assets/javascripts/discourse/components/google-dfp-ad.js.es6 b/assets/javascripts/discourse/components/google-dfp-ad.js.es6
index acb92f5..80db160 100755
--- a/assets/javascripts/discourse/components/google-dfp-ad.js.es6
+++ b/assets/javascripts/discourse/components/google-dfp-ad.js.es6
@@ -16,7 +16,7 @@ function splitHeightInt(value) {
     var str = value.substring(4, 7);
     return str.trim();
 }
-
+/*
 // Coaches Note!  
 // Background: We want to call on google.setTargeting using googletag.bar so that we can can take in inputs from users (key and value) for custom targeting.
 // Look at 26 - 55 which should call on googletag.setTargeting.
@@ -99,8 +99,9 @@ function loadGoogle(settings) {
         }
         else {
           googletag.defineSlot('/' + settings.dfp_publisher_id + '/' + settings.dfp_topic_list_top_code, [parseInt(splitWidthInt(settings.topic_list_top_ad_sizes)), parseInt(splitHeightInt(settings.topic_list_top_ad_sizes))], 'div-gpt-ad-topic-list-top')
-          custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_value_code)))
-          googletag.addService(googletag.pubads());
+          //custom_targeting((keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_key_code)), (keyParse(Discourse.SiteSettings.dfp_target_topic_list_top_value_code)))
+          .setTargeting('gender', 'female')
+          .addService(googletag.pubads());
         }
       }
       if (settings.dfp_topic_above_post_stream_code && !settings.dfp_show_topic_above_post_stream && settings.topic_above_post_stream_ad_sizes) {
@@ -111,7 +112,7 @@ function loadGoogle(settings) {
         }
         else {
           googletag.defineSlot('/' + settings.dfp_publisher_id + '/' + settings.dfp_topic_above_post_stream_code, [parseInt(splitWidthInt(settings.topic_above_post_stream_ad_sizes)), parseInt(splitHeightInt(settings.topic_above_post_stream_ad_sizes))], 'div-gpt-ad-topic-above-post-stream')
-          .setTargeting(settings.dfp_target_topic_above_post_stream_key_code, valueParse(settings.dfp_target_topic_above_post_stream_value_code))
+          //.setTargeting(settings.dfp_target_topic_above_post_stream_key_code, valueParse(settings.dfp_target_topic_above_post_stream_value_code))
           // This hardcoded code works: .setTargeting('category', ["clothes", "handbags", "makeup"])
           .addService(googletag.pubads());       
         }
@@ -125,7 +126,7 @@ function loadGoogle(settings) {
         else {
           googletag.defineSlot('/' + settings.dfp_publisher_id + '/' + settings.dfp_topic_above_suggested_code, [parseInt(splitWidthInt(settings.topic_above_suggested_ad_sizes)), parseInt(splitHeightInt(settings.topic_above_suggested_ad_sizes))], 'div-gpt-ad-topic-above-suggested')
           
-          googletag.setTargeting(settings.dfp_target_topic_above_suggested_key_code, valueParse(settings.dfp_target_topic_above_suggested_value_code))
+          //googletag.setTargeting(settings.dfp_target_topic_above_suggested_key_code, valueParse(settings.dfp_target_topic_above_suggested_value_code))
           // This hardcoded code works: .setTargeting('category', ["clothes", "handbags", "makeup"])
           googletag.addService(googletag.pubads());
         }
@@ -138,7 +139,7 @@ function loadGoogle(settings) {
         }
         else {
           googletag.defineSlot('/' + settings.dfp_publisher_id + '/' + settings.dfp_post_bottom_code, [parseInt(splitWidthInt(settings.post_bottom_ad_sizes)), parseInt(splitHeightInt(settings.post_bottom_ad_sizes))], 'div-gpt-ad-post-bottom')
-          .setTargeting(settings.dfp_target_post_bottom_key_code, valueParse(settings.dfp_target_post_bottom_value_code))
+          //.setTargeting(settings.dfp_target_post_bottom_key_code, valueParse(settings.dfp_target_post_bottom_value_code))
           // This hardcoded code works: .setTargeting('category', ["clothes", "handbags", "makeup"])
           .addService(googletag.pubads());        
         }
diff --git a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs
new file mode 100644
index 0000000..6400ab1
--- /dev/null
+++ b/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-adplugin.hbs
@@ -0,0 +1,6 @@
+{{#if siteSettings.adsense_topic_list_top_code}}
+  {{google-adsense placement="topic-list-top"}}
+{{/if}}
+{{#if siteSettings.dfp_topic_list_top_code}}
+  {{google-dfp-ad placement="topic-list-top"}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-adsense.hbs b/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-adsense.hbs
deleted file mode 100644
index 6ea3613..0000000
--- a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-adsense.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if siteSettings.adsense_topic_list_top_code}}
-  {{google-adsense placement="topic-list-top"}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-dfp.hbs
deleted file mode 100755
index cc027b1..0000000
--- a/assets/javascripts/discourse/templates/connectors/discovery-list-container-top/discourse-google-dfp.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if siteSettings.dfp_topic_list_top_code}}
-  {{google-dfp-ad placement="topic-list-top"}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs
new file mode 100644
index 0000000..813f65e
--- /dev/null
+++ b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-adplugin.hbs
@@ -0,0 +1,6 @@
+{{#if postSpecificCountAdsense}}
+	{{google-adsense placement="post-bottom"}}
+{{/if}}
+{{#if postSpecificCountDFP}}
+  {{google-dfp-ad placement="post-bottom"}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-adsense.hbs b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-adsense.hbs
deleted file mode 100644
index 32e47ed..0000000
--- a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-adsense.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if postSpecificCountAdsense}}
-	{{google-adsense placement="post-bottom"}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs
deleted file mode 100644
index 67d6664..0000000
--- a/assets/javascripts/discourse/templates/connectors/post-bottom/discourse-google-dfp.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if postSpecificCountDFP}}
-  {{google-dfp-ad placement="post-bottom"}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs
new file mode 100644
index 0000000..b9d5657
--- /dev/null
+++ b/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-adplugin.hbs
@@ -0,0 +1,6 @@
+{{#if siteSettings.adsense_topic_above_post_stream_code}}
+  {{google-adsense placement="topic-above-post-stream"}}
+{{/if}}
+{{#if siteSettings.dfp_topic_above_post_stream_code}}
+  {{google-dfp-ad placement="topic-above-post-stream"}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-adsense.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-adsense.hbs
deleted file mode 100644
index 5349f0e..0000000
--- a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-adsense.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if siteSettings.adsense_topic_above_post_stream_code}}
-  {{google-adsense placement="topic-above-post-stream"}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-dfp.hbs
deleted file mode 100755
index d9a81de..0000000
--- a/assets/javascripts/discourse/templates/connectors/topic-above-post-stream/discourse-google-dfp.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if siteSettings.dfp_topic_above_post_stream_code}}
-  {{google-dfp-ad placement="topic-above-post-stream"}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs
new file mode 100644
index 0000000..c429a37
--- /dev/null
+++ b/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-adplugin.hbs
@@ -0,0 +1,6 @@
+{{#if siteSettings.adsense_topic_above_suggested_code}}
+  {{google-adsense placement="topic-above-suggested"}}
+{{/if}}
+{{#if siteSettings.dfp_topic_above_suggested_code}}
+  {{google-dfp-ad placement="topic-above-suggested"}}
+{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-adsense.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-adsense.hbs
deleted file mode 100644
index 8f281a9..0000000
--- a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-adsense.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if siteSettings.adsense_topic_above_suggested_code}}
-  {{google-adsense placement="topic-above-suggested"}}
-{{/if}}
\ No newline at end of file
diff --git a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-dfp.hbs b/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-dfp.hbs
deleted file mode 100755
index 0234980..0000000
--- a/assets/javascripts/discourse/templates/connectors/topic-above-suggested/discourse-google-dfp.hbs
+++ /dev/null
@@ -1,3 +0,0 @@
-{{#if siteSettings.dfp_topic_above_suggested_code}}
-  {{google-dfp-ad placement="topic-above-suggested"}}
-{{/if}}
\ No newline at end of file