diff --git a/kamailio/default.cfg b/kamailio/default.cfg
index 644f244..5fe3bae 100644
--- a/kamailio/default.cfg
+++ b/kamailio/default.cfg
@@ -217,6 +217,9 @@ include_file "nodes-role.cfg"
 #!ifdef REGISTRAR_SYNC-ROLE
 include_file "registrar-sync-role.cfg"
 #!endif
+#!ifdef FAST_PICKUP-ROLE
+include_file "fast-pickup-role.cfg"
+#!endif
 
 ####### Permissions module ##########
 loadmodule "permissions.so"
@@ -695,7 +698,7 @@ failure_route[INTERNAL_FAULT]
 
     # if the failure case was something that we should recover
     # from then try to find a new media server
-    } else if ("$var(reply_reason)" =~ "call barred") {
+    } else if ($var(reply_reason) =~ "call barred") {
         xlog("L_INFO", "$ci|log|failure route ignoring call barred");
     } else if (isflagset(FLAG_SESSION_PROGRESS)) {
         xlog("L_INFO", "$ci|log|failure route ignoring failure after session progress");
diff --git a/kamailio/dispatcher-role.cfg b/kamailio/dispatcher-role.cfg
index cfb4046..50de9a8 100644
--- a/kamailio/dispatcher-role.cfg
+++ b/kamailio/dispatcher-role.cfg
@@ -69,61 +69,9 @@ route[DISPATCHER_FIND_ROUTES]
     }
     #!endif
 
-    if (is_method("INVITE")) {
-    
-       $var(replaced_call_id) = "none";
-
-       if( $(ou{uri.param,kazoo-id}{s.len}) > 0) {
-           if($hdr(Replaces)== $null) {
-              $var(replaced_call_id) = $(ou{uri.param,kazoo-id}{s.unescape.param});
-              append_hf("Replaces: $var(replaced_call_id)\r\n");
-           }
-       }
-
-       if($hdr(Replaces)!= $null) {
-          $var(replaced_call_id) = $(hdr(Replaces){s.select,0,;});
-       }
-
-        if($var(replaced_call_id) != "none") {
-          xlog("L_INFO", "$ci|log|replaces call-id $var(replaced_call_id)");
-          $var(amqp_payload_request) = '{"Event-Category" : "call_event" , "Event-Name" : "channel_status_req", "Call-ID" : "' + $var(replaced_call_id) + '", "Active-Only" : true }';
-          $var(amqp_routing_key) = "call.status_req." + $(var(replaced_call_id){kz.encode});
-          if(kazoo_query("callevt", $var(amqp_routing_key), $var(amqp_payload_request))) {
-               $du = $(kzR{kz.json,Switch-URL});
-               if($du != $null) {
-                  xlog("L_INFO", "$ci|log|call-id $var(replaced_call_id) found redirecting call to $du, courtesy of kazoo");
-                  return;
-               }
-          }
-        }
-
-        ##### CALL-PARK ####
-        if($(ru{uri.user}) =~ "\*3" && $sht(park=>$(ru{uri.user})@$(ru{uri.domain})) != $null) {
-          $du = $sht(park=>$(ru{uri.user})@$(ruri{uri.domain}));
-          xlog("L_INFO", "$ci|log|redirecting park request to $du");
-          if ($hdr(Proxy-Authorization) != $null) {
-              xlog("L_INFO", "$ci|log|removed park redirect");
-              $sht(park=>$(ru{uri.user})@$(ruri{uri.domain})) = $null;
-          }
-          return;
-        }
-
-
-      ##### CALL-PARK IN KAZOO ####
-      if($(ru{uri.user}) =~ "\*3" && !($rd =~ "[0-9]{1,3}\.[0-9]{1,3}.[0-9]{1,3}\.[0-9]{1,3}")  ) {
-          xlog("L_INFO", "$ci|log|checking park request to $(ru{uri.user})@$(ru{uri.domain})");
-          $var(amqp_payload_request) = '{"Event-Category" : "call_event" , "Event-Name" : "query_user_channels_req", "Username" : "$(ru{uri.user})", "Realm" : "$(ru{uri.domain})", "Active-Only" : true }';
-          $var(amqp_routing_key) = "call.status_req." + $(var(replaced_call_id){kz.encode});
-          if(kazoo_query("callevt", $var(amqp_routing_key), $var(amqp_payload_request))) {
-               $du = $(kzR{kz.json,Channels[0].switch_url});
-               if($du != $null) {
-                  xlog("L_INFO", "$ci|log|redirecting park request to $du, courtesy of kazoo");
-                  return;
-               }
-          }
-      }
-       
-    }
+    #!ifdef FAST_PICKUP-ROLE
+    route(FAST_PICKUP);
+    #!endif
 
     if (!ds_select_dst("$var(ds_group)", "0") || $(avp(ds_dst)[0]) == $null) {
         # if we selected from group 1, try again in group 2
diff --git a/kamailio/fast-pickup-role.cfg b/kamailio/fast-pickup-role.cfg
new file mode 100644
index 0000000..c032f19
--- /dev/null
+++ b/kamailio/fast-pickup-role.cfg
@@ -0,0 +1,90 @@
+######## FAST PICKUP ROLE ########
+
+modparam("htable", "htable", "fp=>size=32;autoexpire=3600;");
+
+route[FAST_PICKUP_CHK]
+{
+    if (!is_method("INVITE")) {
+       return;
+    }
+
+    $var(replaced_call_id) = "none";
+
+    if($ru =~ "sip:kfp+") {
+       $var(Cookie) = $(ru{s.rm,sip:kfp+});
+       if($sht(fp=>$var(Cookie)::Call-ID) != $null) {
+           $var(replaced_call_id) = $sht(fp=>$var(Cookie)::Call-ID);
+           if($hdr(Replaces)!= $null) {
+              remove_hf_re("^Replaces");
+           }
+           append_hf("Replaces: $var(replaced_call_id)\r\n");
+           $ru = $sht(fp=>$var(Cookie)::URI);
+           $tu = $sht(fp=>$var(Cookie)::URI);
+           $du = $sht(fp=>$var(Cookie)::Switch-URI);
+           route(EXTERNAL_TO_INTERNAL_RELAY);
+           exit();
+       }
+    }
+
+    if($hdr(Replaces)!= $null) {
+       $var(replaced_call_id) = $(hdr(Replaces){s.select,0,;});
+    }
+
+    if($var(replaced_call_id) != "none") {
+       xlog("L_INFO", "$ci|log|replaces call-id $var(replaced_call_id)");
+       $var(amqp_payload_request) = '{"Event-Category" : "call_event" , "Event-Name" : "channel_status_req", "Call-ID" : "' + $var(replaced_call_id) + '", "Active-Only" : true }';
+       $var(amqp_routing_key) = "call.status_req." + $(var(replaced_call_id){kz.encode});
+       if(kazoo_query("callevt", $var(amqp_routing_key), $var(amqp_payload_request))) {
+           $du = $(kzR{kz.json,Switch-URL});
+           if($du != $null) {
+                xlog("L_INFO", "$ci|log|call-id $var(replaced_call_id) found redirecting call to $du, courtesy of kazoo");
+                route(EXTERNAL_TO_INTERNAL_RELAY);
+                exit();
+           }
+       }
+    }
+
+    ##### CALL-PARK ####
+    if($(ru{uri.user}) =~ "\*3" && $sht(park=>$(ru{uri.user})@$(ru{uri.domain})) != $null) {
+       $du = $sht(park=>$(ru{uri.user})@$(ruri{uri.domain}));
+       xlog("L_INFO", "$ci|log|redirecting park request to $du");
+       if ($hdr(Proxy-Authorization) != $null) {
+           xlog("L_INFO", "$ci|log|removed park redirect");
+           $sht(park=>$(ru{uri.user})@$(ruri{uri.domain})) = $null;
+       }
+       route(EXTERNAL_TO_INTERNAL_RELAY);
+       exit();
+    }
+
+
+    ##### CALL-PARK IN KAZOO ####
+    if($(ru{uri.user}) =~ "\*3" && !($rd =~ "[0-9]{1,3}\.[0-9]{1,3}.[0-9]{1,3}\.[0-9]{1,3}")  ) {
+       xlog("L_INFO", "$ci|log|checking park request to $(ru{uri.user})@$(ru{uri.domain})");
+       $var(amqp_payload_request) = '{"Event-Category" : "call_event" , "Event-Name" : "query_user_channels_req", "Username" : "$(ru{uri.user})", "Realm" : "$(ru{uri.domain})", "Active-Only" : true }';
+       $var(amqp_routing_key) = "call.status_req." + $(var(replaced_call_id){kz.encode});
+       if(kazoo_query("callevt", $var(amqp_routing_key), $var(amqp_payload_request))) {
+            $du = $(kzR{kz.json,Channels[0].switch_url});
+            if($du != $null) {
+               xlog("L_INFO", "$ci|log|redirecting park request to $du, courtesy of kazoo");
+               route(EXTERNAL_TO_INTERNAL_RELAY);
+               exit();
+            }
+       }
+    }
+       
+}
+
+route[FAST_PICKUP_INIT]
+{
+    $var(AppName) = $(kzE{kz.json,App-Name});
+    if($var(AppName) == "park") {
+       $var(Pickup) =  ";kazoo-pickup=true";
+    } else {
+       $var(Pickup) =  "";
+    }
+    $sht(fp=>$(kzE{kz.json,Call-Cookie})::Switch-URI) = $(kzE{kz.json,Switch-URI});
+    $sht(fp=>$(kzE{kz.json,Call-Cookie})::Call-ID) = $(kzE{kz.json,Target-Call-ID});
+    $sht(fp=>$(kzE{kz.json,Call-Cookie})::URI) = "sip:" + $(kzE{kz.json,From-User}) + "@" + $(kzE{kz.json,To-Realm}) + $var(Pickup);
+}
+
+# vim: tabstop=4 softtabstop=4 shiftwidth=4 expandtab
diff --git a/kamailio/local.cfg b/kamailio/local.cfg
index de5a18e..1f8f058 100644
--- a/kamailio/local.cfg
+++ b/kamailio/local.cfg
@@ -13,6 +13,7 @@ debug = L_INFO
 #!trydef PRESENCE-ROLE
 #!trydef RESPONDER-ROLE
 #!trydef NODES-ROLE
+#!trydef FAST_PICKUP-ROLE
 
 ## Disabled Roles - remove all but the last '#' to enable
 # # #!trydef TRAFFIC_FILTER-ROLE
diff --git a/kamailio/presence-role.cfg b/kamailio/presence-role.cfg
index 343a938..148f25c 100644
--- a/kamailio/presence-role.cfg
+++ b/kamailio/presence-role.cfg
@@ -3,7 +3,7 @@
 #!trydef PRESENCE_MIN_EXPIRES_ACTION 1
 #!trydef PRESENCE_MAX_EXPIRES 3600
 
-modparam("htable", "htable", "p=>size=32;autoexpire=600;")
+modparam("htable", "htable", "p=>size=32;autoexpire=3600;")
 
 loadmodule "presence.so"
 loadmodule "presence_dialoginfo.so"
@@ -104,10 +104,12 @@ route[HANDLE_PUBLISH]
 event_route[kazoo:consumer-event-presence-update]
 {
     if( $(kzE{kz.json,Event-Package}) == "dialog") {   
-        if($sht(p=>$(kzE{kz.json,Call-ID})-$(kzE{kz.json,From})) != $(kzE{kz.json,State})) {
+        if($sht(p=>$(kzE{kz.json,Call-ID})) != $(kzE{kz.json,State})) {
              xlog("L_INFO", "received $(kzE{kz.json,Event-Package}) update for $(kzE{kz.json,From})");
-             xlog("L_INFO", "payload $kzE");
-             $sht(p=>$(kzE{kz.json,Call-ID})-$(kzE{kz.json,From})) = $(kzE{kz.json,State});
+             $sht(p=>$(kzE{kz.json,Call-ID})) = $(kzE{kz.json,State});
+             #!ifdef FAST_PICKUP-ROLE
+             route(FAST_PICKUP_INIT);
+             #!endif
              kazoo_pua_publish($kzE);
              pres_refresh_watchers("$(kzE{kz.json,From})", "$(kzE{kz.json,Event-Package})", 1);
         } else {