diff --git a/includes/admin/transifex-live-integration-admin-template.php b/includes/admin/transifex-live-integration-admin-template.php
index 244e18d2..ed30942c 100644
--- a/includes/admin/transifex-live-integration-admin-template.php
+++ b/includes/admin/transifex-live-integration-admin-template.php
@@ -87,16 +87,37 @@
 				<td>
 					<p><input type="checkbox" id="transifex_live_settings_enable_prerender" name="transifex_live_settings[enable_prerender]" value="1" <?php echo $checked_enable_prerender ?> /><?php _e('Enable Prerender', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>
 					</p>
-                    <p class="prerender-enable-options hide-if-js">
+                    <div class="prerender-enable-options hide-if-js">
 						<label for="transifex_live_settings[prerender_url]"><?php _e( 'Prerender URL', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?></label>
 						<input name="transifex_live_settings[prerender_url]" type="text" id="transifex_live_settings_prerender_url" value="<?php echo $settings['prerender_url']; ?>" class="regular-text" placeholder="<?php _e( 'Put your prerender url here.', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
+					<div class="prerender-advanced-options hide-if-js">
+					<p>
+						<input type="checkbox" id="transifex_live_settings_enable_prerender_check" name="transifex_live_settings[enable_prerender_check]" value="1" <?php echo $checked_enable_prerender_check ?> /><?php _e( 'Enable Prerender Check', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>
+						<input name="transifex_live_settings[prerender_header_check_key]" type="text" id="transifex_live_settings_prerender_header_check_key" value="<?php echo $settings['prerender_header_check_key']; ?>" class="regular-text" placeholder="<?php _e( 'Prerender Check Key', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
+						<input name="transifex_live_settings[prerender_header_check_value]" type="text" id="transifex_live_settings_prerender_header_check_value" value="<?php echo $settings['prerender_header_check_value']; ?>" class="regular-text" placeholder="<?php _e( 'Prerender Check Header Value', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
+					</p>
+					<p>
+						<input type="checkbox" id="transifex_live_settings_prerender_enable_vary_header" name="transifex_live_settings[prerender_enable_vary_header]" value="1" <?php echo $checked_prerender_enable_vary_header ?> /><?php _e( 'Enable Vary Header', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>
+						<input name="transifex_live_settings[prerender_vary_header_value]" type="text" id="transifex_live_settings_prerender_vary_header_value" value="<?php echo $settings['prerender_vary_header_value']; ?>" class="regular-text" placeholder="<?php _e( 'Value for Vary Header', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
+					</p>
+					<p>
+						<input type="checkbox" id="transifex_live_settings_prerender_enable_response_header" name="transifex_live_settings[prerender_enable_response_header]" value="1" <?php echo $checked_prerender_enable_response_header ?> /><?php _e( 'Enable Custom Prerender Headers', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>
+						<input name="transifex_live_settings[prerender_response_headers]" type="text" id="transifex_live_settings_prerender_response_headers" value="<?php echo htmlentities( stripslashes($prerender_response_headers)); ?>" class="regular-text" placeholder="<?php _e( 'Custom Headers for Prerender Responses', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
+					</p>
+					<p>
+						<input type="checkbox" id="transifex_live_settings_prerender_enable_cookie" name="transifex_live_settings[prerender_enable_cookie]" value="1" <?php echo $checked_prerender_enable_cookie ?> /><?php _e( 'Enable Custom Cookie Prerender Responses', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>
+						<input name="transifex_live_settings[prerender_cookie]" type="text" id="transifex_live_settings_prerender_cookie" value="<?php echo htmlentities( stripslashes($prerender_cookie)); ?>" class="regular-text" placeholder="<?php _e( 'Custom Cookie for Prerender Responses', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
+					</p>
+					<p>
+						<input name="transifex_live_settings[whitelist_crawlers]" type="text" id="transifex_live_settings_whitelist_crawlers" value="<?php echo $settings['whitelist_crawlers']; ?>" class="regular-text" placeholder="<?php _e( 'Regex whitelist of allowed crawlers.', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
+						<input name="transifex_live_settings[generic_bot_types]" type="text" id="transifex_live_settings_generic_bot_types" value="<?php echo $settings['generic_bot_types']; ?>" class="regular-text" placeholder="<?php _e( 'Regex list of crawler type keywords.', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?>">
 					</p>
+					</div>
 					<p class="description"><?php _e( 'Important so crawler and bots can see your translated content <a target="_blank" href="#">Check out our docs for details.</a>', TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN ); ?></p>
-				
+					</div>
 				</td></tr>
 			</tbody>
         </table>
-		<input type="hidden" id="transifex_live_settings_enable_prerender_check" name="transifex_live_settings[enable_prerender_check]" value="<?php echo $enable_prerender_check ?>" />
 		<input name="transifex_live_settings[enable_custom_urls]" id="transifex_live_settings_custom_urls" type="hidden" value="<?php echo $checked_custom_urls ?>" >
 		<input type="hidden" value="<?php echo htmlentities( stripslashes( $language_map ) ) ?>" name="transifex_live_settings[language_map]" id="transifex_live_settings_language_map" />
 		<input type="hidden" value="<?php echo htmlentities( stripslashes( $transifex_settings_settings ) ) ?>" name="transifex_live_transifex_settings[settings]" id="transifex_live_transifex_settings_settings" />
diff --git a/includes/admin/transifex-live-integration-admin.php b/includes/admin/transifex-live-integration-admin.php
index 7f005896..59cfce87 100644
--- a/includes/admin/transifex-live-integration-admin.php
+++ b/includes/admin/transifex-live-integration-admin.php
@@ -84,8 +84,22 @@ static function options_page() {
 		ob_start();
 		checked( $settings['enable_prerender'], 1 );
 		$checked_enable_prerender = ob_get_clean();
+		
+		ob_start();
+		checked( $settings['enable_prerender_check'], 1 );
+		$checked_enable_prerender_check = ob_get_clean();
+		
+		ob_start();
+		checked( $settings['prerender_enable_response_header'], 1 );
+		$checked_prerender_enable_response_header = ob_get_clean();
+
+		ob_start();
+		checked( $settings['prerender_enable_vary_header'], 1 );
+		$checked_prerender_enable_vary_header = ob_get_clean();
 
-		$enable_prerender_check = $settings['enable_prerender_check'];
+		ob_start();
+		checked( $settings['prerender_enable_cookie'], 1 );
+		$checked_prerender_enable_cookie = ob_get_clean();
 
 		ob_start();
 		checked( $settings['static_frontpage_support'], 1 );
@@ -116,6 +130,17 @@ static function options_page() {
 		if ( $settings['language_map'] !== '' ) {
 			$language_map = $settings['language_map'];
 		}
+		
+		$prerender_response_headers = '';
+		if ( $settings['prerender_response_headers'] !== '' ) {
+			$prerender_response_headers = $settings['prerender_response_headers'];
+		}
+		
+		$prerender_cookie = '';
+		if ( $settings['prerender_cookie'] !== '' ) {
+			$prerender_cookie = $settings['prerender_cookie'];
+		}		
+		
 		$checked_custom_urls = ($settings['enable_custom_urls'] === "1") ? "1" : "0";
 
 		$url_options = $settings['url_options'];
@@ -128,6 +153,8 @@ static function options_page() {
 		ob_start();
 		checked( $settings['url_options'], '3' );
 		$url_options_subdirectory = ob_get_clean();
+		
+		
 		$site_url = site_url();
 		$site_url_subdirectory_example = $site_url . '/%lang%';
 		$site_url_array = explode( '/', $site_url );
@@ -267,7 +294,6 @@ static public function sanitize_settings( $settings ) {
 		$settings['transifex_live_settings']['subdomain_pattern'] = ( isset( $settings['transifex_live_settings']['subdomain_pattern'] )) ? sanitize_text_field( $settings['transifex_live_settings']['subdomain_pattern'] ) : '';
 		$settings['transifex_live_settings']['languages_regex'] = ( isset( $settings['transifex_live_settings']['languages_regex'] )) ? sanitize_text_field( $settings['transifex_live_settings']['languages_regex'] ) : '';
 		$settings['transifex_live_settings']['transifex_languages'] = ( isset( $settings['transifex_live_settings']['transifex_languages'] )) ? sanitize_text_field( stripslashes( $settings['transifex_live_settings']['transifex_languages'] ) ) : '';
-		$settings['transifex_live_settings']['language_map'] = ( isset( $settings['transifex_live_settings']['language_map'] )) ? sanitize_text_field( $settings['transifex_live_settings']['language_map'] ) : '';
 
 
 		$settings['transifex_live_transifex_settings']['settings'] = ( isset( $settings['transifex_live_transifex_settings']['settings'] )) ? sanitize_text_field( stripslashes( $settings['transifex_live_transifex_settings']['settings'] ) ) : '';
diff --git a/includes/lib/transifex-live-integration-hreflang.php b/includes/lib/transifex-live-integration-hreflang.php
index 2bb414a7..df3434f9 100644
--- a/includes/lib/transifex-live-integration-hreflang.php
+++ b/includes/lib/transifex-live-integration-hreflang.php
@@ -33,17 +33,52 @@ class Transifex_Live_Integration_Hreflang {
 	 * @var tokenized_url string 
 	 */
 	private $tokenized_url;
+	
+	private $rewrite_options;
 
 	/**
 	 * Public constructor, sets the settings
 	 * @param array $settings Associative array used to store plugin settings.
 	 */
-	public function __construct( $settings ) {
+	public function __construct( $settings, $rewrite_options ) {
 		Plugin_Debug::logTrace();
 		$this->settings = $settings;
 		$this->language_map = json_decode( $settings['language_map'], true )[0];
 		$this->languages = json_decode( $settings['transifex_languages'], true );
 		$this->tokenized_url = $settings['tokenized_url'];
+		$this->rewrite_options = $rewrite_options;
+	}
+	
+	public function check_rewrite_options() {
+		Plugin_Debug::logTrace();
+		if ( isset( $this->rewrite_options['add_rewrites_post'] ) && is_single ()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_root'] ) && is_home()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_date'] ) && is_archive()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_page'] ) && is_page ()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_author'] ) && is_author()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_tag'] ) && is_tag()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_category'] ) && is_category()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_search'] ) && is_search()) {
+			return true;
+		}
+		if ( isset( $this->rewrite_options['add_rewrites_feed'] ) && is_feed()) {
+			return true;
+		}
+		return false;
 	}
 
 	/*
@@ -74,6 +109,9 @@ private function generate_languages_hreflang( $raw_url, $languages,
 	 */
 	public function render_hreflang() {
 		Plugin_Debug::logTrace();
+		if ( !($this->check_rewrite_options())) {
+			return false;
+		}
 		global $wp;
 		$lang = get_query_var( 'lang' );
 		$url_path = add_query_arg( array(), $wp->request );
diff --git a/includes/lib/transifex-live-integration-prerender.php b/includes/lib/transifex-live-integration-prerender.php
index 5d027e0d..bf9989ad 100644
--- a/includes/lib/transifex-live-integration-prerender.php
+++ b/includes/lib/transifex-live-integration-prerender.php
@@ -21,6 +21,16 @@ class Transifex_Live_Integration_Prerender {
 	 * @var bool
 	 */
 	private $enable_prerender_check;
+	private $prerender_enable_vary_header;
+	private $prerender_vary_header_value;
+	private $prerender_header_check_key;
+	private $prerender_header_check_value;
+	private $prerender_enable_cookie;
+	private $prerender_cookie;
+	private $prerender_enable_response_header;
+	private $prerender_response_headers;
+	private $generic_bot_types;
+	private $whitelist_crawlers;
 
 	/*
 	 * Constructor
@@ -28,10 +38,28 @@ class Transifex_Live_Integration_Prerender {
 	 * @param bool $override_prerender_check Overrides check for prerender header
 	 */
 
-	public function __construct( $prerender_url, $enable_prerender_check ) {
+	public function __construct( $prerender_url, $enable_prerender_check, $settings ) {
 		Plugin_Debug::logTrace();
 		$this->prerender_url = $prerender_url;
 		$this->enable_prerender_check = ($enable_prerender_check) ? true : false;
+		$this->prerender_enable_vary_header = (isset( $settings['prerender_enable_vary_header'] )) ? true : false;
+		$this->prerender_vary_header_value = $settings['prerender_vary_header_value'];
+		$this->prerender_header_check_key = $settings['prerender_header_check_key'];
+		$this->prerender_header_check_value = $settings['prerender_header_check_value'];
+		$this->prerender_enable_response_header = (isset( $settings['prerender_enable_response_header'] )) ? true : false;
+		$this->generic_bot_types = $settings['generic_bot_types'];
+		$this->whitelist_crawlers = $settings['whitelist_crawlers'];
+		
+		$this->prerender_response_headers = [ ];
+		if ( isset( $settings['prerender_response_headers'] ) ) {
+			$this->prerender_response_headers = json_decode( stripslashes($settings['prerender_response_headers']), true );
+		}
+
+		$this->prerender_enable_cookie = (isset( $settings['prerender_enable_cookie'] )) ? true : false;
+		$this->prerender_cookie = [ ];
+		if ( isset( $settings['prerender_cookie'] ) ) {
+			$this->prerender_cookie = json_decode( stripslashes($settings['prerender_cookie']), true );
+		}
 	}
 
 	/*
@@ -49,34 +77,77 @@ function wp_head_hook() {
 		echo $status;
 	}
 
+	function wp_headers_response_hook( $headers ) {
+		Plugin_Debug::logTrace();
+		$a = $this->prerender_response_headers;
+		foreach ($a as $k => $v) {
+			$headers[$k] = $v;
+		}
+		return $headers;
+	}
+
+	function wp_headers_vary_hook( $headers ) {
+		Plugin_Debug::logTrace();
+		$headers['Vary'] = $this->prerender_vary_header_value;
+		return $headers;
+	}
+
 	/*
-	 * WP wp_headers filter, adds a prerender header
+	 * WP wp_headers filter, adds headers for prerender request
 	 */
 
-	function wp_headers_hook( $headers ) {
+	function wp_headers_prerender_hook( $headers ) {
 		Plugin_Debug::logTrace();
-		$headers['X-Prerender-Req'] = 'TRUE';
+		$headers[$this->prerender_header_check_key] = $this->prerender_header_check_value;
 		return $headers;
 	}
 
+	function init_hook() {
+		$a = $this->prerender_cookie;
+		foreach ($a as $k => $v) {
+			setcookie( $k, $v, DAY_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN );
+		}
+	}
+
+	function ok_call_prerender() {
+		include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/transifex-live-integration-util.php';
+		$agent = Transifex_Live_Integration_Util::get_user_agent();
+		$req_escaped_fragment = (isset( $_GET['_escaped_fragment_'] )) ? true : false;
+		include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/lib/transifex-live-integration-prerender.php';
+		$check = Transifex_Live_Integration_Util::prerender_check( $agent, $req_escaped_fragment, $this->generic_bot_types, $this->whitelist_crawlers );
+		return $check;
+	}
+
+	function ok_add_vary_header() {
+		return ($this->prerender_enable_vary_header);
+	}
 
-	function call_curl($url) {
-		$arr = [];
+	function ok_add_response_header() {
+		return ($this->prerender_enable_response_header);
+	}
+
+	function ok_add_cookie() {
+		return ($this->prerender_enable_cookie);
+	}
+
+	function call_curl( $url ) {
+		$arr = [ ];
 		$ch = curl_init();
 		curl_setopt( $ch, CURLOPT_URL, $url );
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 		curl_setopt( $ch, CURLOPT_VERBOSE, 1 );
 		curl_setopt( $ch, CURLOPT_HEADER, 1 );
-		curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT ,10); 
-		curl_setopt( $ch, CURLOPT_TIMEOUT, 20);
+		curl_setopt( $ch, CURLOPT_CONNECTTIMEOUT, 10 );
+		curl_setopt( $ch, CURLOPT_TIMEOUT, 20 );
 		$arr['url'] = $url;
 		$arr['response'] = curl_exec( $ch );
-		$arr['statuscode'] = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		$arr['statuscode'] = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
 		$arr['header_size'] = curl_getinfo( $ch, CURLINFO_HEADER_SIZE );
 		$arr['error'] = curl_error( $ch );
 		curl_close( $ch );
 		return $arr;
 	}
+
 	/*
 	 * This aptly named filter function is used to make the prerender call, 
 	 * 		ideally it should be executed after the template render is finished but before sending to the browser
@@ -87,24 +158,24 @@ function call_curl($url) {
 	function callback( $buffer ) {
 		global $wp;
 		$output = $buffer;
-		$debug_html = '<!--'."\n";
+		$debug_html = '<!--' . "\n";
 		$page_url = home_url( $wp->request );
 		$page_url = rtrim( $page_url, '/' ) . '/';
-		if (function_exists('curl_version')) {
-			$curl_response = $this->call_curl($this->prerender_url . $page_url);
+		if ( function_exists( 'curl_version' ) ) {
+			$curl_response = $this->call_curl( $this->prerender_url . $page_url );
 			$header = substr( $curl_response['response'], 0, $curl_response['header_size'] );
 			$body = substr( $curl_response['response'], $curl_response['header_size'] );
-			$header_lowercase = strtolower($header);
-			$header_prerender_check = (strpos( $header_lowercase, 'x-prerender-req' ))?true:false;
-			$debug_html .= 'X-Prerender-Req Header check:'. $header_prerender_check . "\n";
-			$debug_html .= 'Check enabled:'.$this->enable_prerender_check."\n";
+			$header_lowercase = strtolower( $header );
+			$header_prerender_check = (strpos( $header_lowercase, strtolower( $this->prerender_header_check_key ) )) ? true : false;
+			$debug_html .= 'X-Prerender-Req Header check:' . $header_prerender_check . "\n";
+			$debug_html .= 'Check enabled:' . $this->enable_prerender_check . "\n";
 			if ( $header_prerender_check && $this->enable_prerender_check ) {
-				$output = ($curl_response['response'])?$body:$output;
-				$debug_html .= 'Buffer swapped with prerender response.'."\n";
+				$output = ($curl_response['response']) ? $body : $output;
+				$debug_html .= 'Buffer swapped with prerender response.' . "\n";
 			}
 			$debug_html .= $curl_response['url'] . "\n";
-			$debug_html .= $header."\n";
-			$debug_html .= $curl_response['error']."\n";
+			$debug_html .= $header . "\n";
+			$debug_html .= $curl_response['error'] . "\n";
 		} else {
 			$debug_html .= 'Curl functions missing, skipping prerender call';
 		}
diff --git a/includes/lib/transifex-live-integration-rewrite.php b/includes/lib/transifex-live-integration-rewrite.php
index 5841c385..50f2fabc 100644
--- a/includes/lib/transifex-live-integration-rewrite.php
+++ b/includes/lib/transifex-live-integration-rewrite.php
@@ -71,7 +71,7 @@ public function __construct( $settings, $rewrite_options ) {
 		if ( isset( $rewrite_options['add_rewrites_feed'] ) ) {
 			$this->rewrite_options[] = ($rewrite_options['add_rewrites_feed']) ? 'feed' : '';
 		}
-		if ( isset( $rewrite_options['add_rewrites_feed'] ) ) {
+		if ( isset( $rewrite_options['add_rewrites_permalink_tag'] ) ) {
 			$this->rewrite_options[] = ($rewrite_options['add_rewrites_permalink_tag']) ? 'permalink_tag' : '';
 		}
 		if ( !empty( $settings['languages'] ) ) {
diff --git a/includes/transifex-live-integration-defaults.php b/includes/transifex-live-integration-defaults.php
index 0a627fc2..79a7f1e6 100644
--- a/includes/transifex-live-integration-defaults.php
+++ b/includes/transifex-live-integration-defaults.php
@@ -103,10 +103,19 @@ static function settings()
 		'static_frontpage_support' => false,
 		'enable_prerender' => 0,
 		'prerender_url' => '',
-		'enable_prerender_check' => 1,
         'whitelist_crawlers' =>
         'googlebot|yahoo|bingbot|baiduspider|facebookexternalhit|twitterbot|rogerbot|linkedinbot|embedly|quora link preview|showyoubot|outbrain|pinterest/0.|developers.google.com/+/web/snippet|slackbot|vkshare|w3c_validator|redditbot|applebot|whatsapp|flipboard',
-        'generic_bot_types' => 'bot|crawl|slurp|spider'
+        'generic_bot_types' => 'bot|crawl|slurp|spider',
+		'enable_prerender_check' => 1,
+		'prerender_header_check_key' => 'X-Prerender-Req',
+		'prerender_header_check_value' => 'TRUE',
+		'prerender_enable_response_header' => 0,
+
+		'prerender_response_headers' =>	'{"Expires" : "Tue, 03 Jul 2001 06:00:00 GMT", "Last-Modified" : "{now} GMT","Cache-Control":"max-age=0, no-cache, must-revalidate, proxy-revalidate"}',
+		'prerender_enable_vary_header' => 1,
+		'prerender_vary_header_value' => 'User-Agent,X-Prerender-Req',
+		'prerender_enable_cookie' => 0,
+		'prerender_cookie' => '{"wordpress_test_cookie" : "WP+Cookie+check"}'
         );
     }
 
diff --git a/includes/transifex-live-integration-static-factory.php b/includes/transifex-live-integration-static-factory.php
index ecbad768..9f1b9ce0 100644
--- a/includes/transifex-live-integration-static-factory.php
+++ b/includes/transifex-live-integration-static-factory.php
@@ -16,7 +16,7 @@ class Transifex_Live_Integration_Static_Factory {
 	 * @return object/false Returns either new object or false
 	 */
 
-	static function create_hreflang( $settings ) {
+	static function create_hreflang( $settings, $rewrite_options ) {
 		if ( !isset( $settings['api_key'] ) ) {
 			Plugin_Debug::logTrace( 'settings[api_key] not set...skipping hreflang' );
 			return false;
@@ -34,7 +34,7 @@ static function create_hreflang( $settings ) {
 			return false;
 		}
 		include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/lib/transifex-live-integration-hreflang.php';
-		return new Transifex_Live_Integration_Hreflang( $settings );
+		return new Transifex_Live_Integration_Hreflang( $settings, $rewrite_options );
 	}
 
 	/*
@@ -153,14 +153,10 @@ static function create_prerender( $settings ) {
 			Plugin_Debug::logTrace( 'URL option is none, skipping prerender' );
 			return false;
 		}
-		include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/transifex-live-integration-util.php';
-		$agent = Transifex_Live_Integration_Util::get_user_agent();
-		$req_escaped_fragment = (isset( $_GET['_escaped_fragment_'] )) ? true : false;
 
 		include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/lib/transifex-live-integration-prerender.php';
-		$check = Transifex_Live_Integration_Util::prerender_check( $agent, $req_escaped_fragment, $settings['generic_bot_types'], $settings['whitelist_crawlers'] );
 		$enable_prerender_check = (isset($settings['enable_prerender_check']))?true:false;
-		return ($check) ? new Transifex_Live_Integration_Prerender( $settings['prerender_url'], $enable_prerender_check ) : false;
+		return new Transifex_Live_Integration_Prerender( $settings['prerender_url'], $enable_prerender_check, $settings );
 	}
 
 }
diff --git a/readme.md b/readme.md
index ec19d49b..ee4dc58b 100755
--- a/readme.md
+++ b/readme.md
@@ -109,4 +109,7 @@ Added Prerendering capability
 Fixed some timing issues with the WP loop
 
 = 1.3.1 =
-Patch for Prerender logic
\ No newline at end of file
+Patch for Prerender logic
+
+= 1.3.2 =
+Added additional Prerender options for caching
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 4c298f9e..52459bf9 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,8 +3,8 @@ Name: Transifex Live Translation Plugin
 Contributors: txmatthew, ThemeBoy, brooksx
 Tags: transifex, translate, translations, localize, localise, localization, localisation, multilingual, t9n, l10n, i18n, language, switcher, live, translation, translator
 Requires at least: 3.5.2
-Tested up to: 4.4.2
-Stable tag: 1.3.1
+Tested up to: 4.5
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -117,4 +117,7 @@ Added Prerendering capability
 Fixed some timing issues with the WP loop
 
 = 1.3.1 =
-Patch for Prerender logic
\ No newline at end of file
+Patch for Prerender logic
+
+= 1.3.2 =
+Added additional Prerender options for caching
\ No newline at end of file
diff --git a/transifex-live-integration-main.php b/transifex-live-integration-main.php
index 7899b789..5cf0eb0d 100755
--- a/transifex-live-integration-main.php
+++ b/transifex-live-integration-main.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Includes Transifex Live Main class
  * @package TransifexLiveIntegration
@@ -16,13 +17,13 @@ class Transifex_Live_Integration {
 	 */
 	static function do_plugin( $is_admin, $version ) {
 		$settings = get_option( 'transifex_live_settings', array() );
-				include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/transifex-live-integration-defaults.php';
+		include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/transifex-live-integration-defaults.php';
 		if ( !$settings ) {
 
 			$settings = Transifex_Live_Integration_Defaults::settings();
 		}
-		$debug_mode = ($settings['debug'])?true:false;
-		
+		$debug_mode = ($settings['debug']) ? true : false;
+
 		require_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/common/plugin-debug.php';
 		new Plugin_Debug( $debug_mode );
 		Plugin_Debug::logTrace( 'debug initialized' );
@@ -40,7 +41,7 @@ static function do_plugin( $is_admin, $version ) {
 		add_action( 'wp_after_admin_bar_render', [ 'Transifex_Live_Integration_Admin_Util', 'wp_after_admin_bar_render_hook' ] );
 
 
-		if ( $is_admin ) { 
+		if ( $is_admin ) {
 			include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/admin/transifex-live-integration-admin.php';
 			include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/admin/transifex-live-integration-admin-util.php';
 			include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/common/transifex-live-integration-static-files-handler.php';
@@ -64,7 +65,7 @@ static function do_plugin( $is_admin, $version ) {
 			load_plugin_textdomain( TRANSIFEX_LIVE_INTEGRATION_TEXT_DOMAIN, false, TRANSIFEX_LIVE_INTEGRATION_LANGUAGES_PATH );
 		}
 
-		if ( !($is_admin) ) { 
+		if ( !($is_admin) ) {
 			include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/transifex-live-integration-static-factory.php';
 			include_once TRANSIFEX_LIVE_INTEGRATION_DIRECTORY_BASE . '/includes/transifex-live-integration-util.php';
 
@@ -81,22 +82,35 @@ static function do_plugin( $is_admin, $version ) {
 			$prerender = Transifex_Live_Integration_Static_Factory::create_prerender( $settings );
 			($prerender) ? Plugin_Debug::logTrace( 'prerender created' ) : Plugin_Debug::logTrace( 'prerender skipped' );
 			if ( $prerender ) {
-				if ( Transifex_Live_Integration_Util::is_prerender_req( Transifex_Live_Integration_Util::get_user_agent() ) ) {
-					Plugin_Debug::logTrace( 'prerender request detected' );
-					add_filter( 'wp_headers', [$prerender, 'wp_headers_hook' ] );
-					add_action( 'wp_head', [$prerender, 'wp_head_hook' ], 1 );
-				} else {
-					Plugin_Debug::logTrace( 'invoke prerender call' );
-					add_action( 'after_setup_theme', [ $prerender, 'after_setup_theme_hook' ] );
-					add_action( 'shutdown', [ $prerender, 'shutdown_hook' ] );
+				if ( $prerender->ok_add_vary_header() ) {
+					add_filter( 'wp_headers', [$prerender, 'wp_headers_vary_hook' ] );
+				}
+
+				if ( $prerender->ok_call_prerender() ) {
+					Plugin_Debug::logTrace( 'pased agent check' );
+					if ( $prerender->ok_add_response_header() ) {
+						add_filter( 'wp_headers', [$prerender, 'wp_headers_response_hook' ] );
+					}
+					if ( $prerender->ok_add_cookie() ) {
+						add_filter( 'init', [$prerender, 'init_hook' ] );
+					}
+					if ( Transifex_Live_Integration_Util::is_prerender_req( Transifex_Live_Integration_Util::get_user_agent() ) ) {
+						Plugin_Debug::logTrace( 'prerender request detected' );
+						add_filter( 'wp_headers', [$prerender, 'wp_headers_prerender_hook' ] );
+						add_action( 'wp_head', [$prerender, 'wp_head_hook' ], 1 );
+					} else {
+						Plugin_Debug::logTrace( 'invoke prerender call' );
+						add_action( 'after_setup_theme', [ $prerender, 'after_setup_theme_hook' ] );
+						add_action( 'shutdown', [ $prerender, 'shutdown_hook' ] );
+					}
 				}
 			}
 
 
-			$hreflang = Transifex_Live_Integration_Static_Factory::create_hreflang( $settings );
+			$hreflang = Transifex_Live_Integration_Static_Factory::create_hreflang( $settings, $rewrite_options );
 			($hreflang) ? Plugin_Debug::logTrace( 'adding hreflang' ) : Plugin_Debug::logTrace( 'skipping hreflang' );
 			if ( $hreflang ) {
-				add_action( 'wp_head', [ $hreflang, 'render_hreflang' ], 1 );
+					add_action( 'wp_head', [ $hreflang, 'render_hreflang' ], 1 );
 			}
 
 			$picker = Transifex_Live_Integration_Static_Factory::create_picker( $settings );
@@ -104,7 +118,7 @@ static function do_plugin( $is_admin, $version ) {
 			if ( $picker ) {
 				add_action( 'wp_head', [ $picker, 'render' ], 1 );
 			}
-		
+
 			$subdomain = Transifex_Live_Integration_Static_Factory::create_subdomains( $settings );
 			($subdomain) ? Plugin_Debug::logTrace( 'subdomains created' ) : Plugin_Debug::logTrace( 'subdomains skipped' );
 			if ( $subdomain ) {
@@ -128,8 +142,8 @@ static function do_plugin( $is_admin, $version ) {
 				add_filter( 'home_url', [$rewrite, 'home_url_hook' ] );
 			}
 			add_action( 'parse_query', [ $rewrite, 'parse_query_hook' ] );
-			$static_frontpage_support = (isset($settings['static_frontpage_support']))?true:false;
-			if ($static_frontpage_support) {
+			$static_frontpage_support = (isset( $settings['static_frontpage_support'] )) ? true : false;
+			if ( $static_frontpage_support ) {
 				add_action( 'parse_query', [ $rewrite, 'parse_query_root_hook' ] );
 			}
 			foreach ($rewrite->rewrite_options as $option) {
@@ -160,7 +174,6 @@ static function do_plugin( $is_admin, $version ) {
 						break;
 					case 'root';
 						add_filter( 'root_rewrite_rules', [ $rewrite, 'root_rewrite_rules_hook' ] );
-
 						break;
 					case 'permalink_tag';
 						add_action( 'init', [ $rewrite, 'init_hook' ] );
@@ -184,4 +197,4 @@ static function activation_hook() {
 		// Placeholder function.
 	}
 
-}
\ No newline at end of file
+}
diff --git a/transifex-live-integration.php b/transifex-live-integration.php
index f994d7dc..7bc76146 100755
--- a/transifex-live-integration.php
+++ b/transifex-live-integration.php
@@ -5,13 +5,13 @@
  *
  * @link    http://docs.transifex.com/developer/integrations/wordpress
  * @package TransifexLiveIntegration
- * @version 1.3.1
+ * @version 1.3.2
  *
  * @wordpress-plugin
  * Plugin Name:       Transifex Live Translation Plugin
  * Plugin URI:        http://docs.transifex.com/developer/integrations/wordpress
  * Description:       Translate your WordPress website or blog without the usual complex setups.
- * Version:           1.3.1
+ * Version:           1.3.2
  * License:           GNU General Public License
  * License URI:       http://www.gnu.org/licenses/gpl-2.0.txt
  * Text Domain:       transifex-live-integration
@@ -75,7 +75,7 @@
 }
 
 define( 'LANG_PARAM', 'lang' );
-$version = '1.3.1';
+$version = '1.3.2';
 
 require_once( dirname( __FILE__ ) . '/transifex-live-integration-main.php' );
 Transifex_Live_Integration::do_plugin( is_admin(), $version );