diff --git a/map/framework.cpp b/map/framework.cpp
index 417d9f1720..37882bb357 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -2188,13 +2188,6 @@ void Framework::SetRouterImpl(RouterType type)
   m_currentRouterType = type;
 }
 
-void Framework::SetRouteBuildingListener(TRouteBuildingCallback const & buildingCallback,
-                                         TRouteProgressCallback const & progressCallback)
-{
-  m_routingCallback = buildingCallback;
-  m_progressCallback = progressCallback;
-}
-
 void Framework::RemoveRoute()
 {
   m_bmManager.UserMarksClear(UserMarkContainer::DEBUG_MARK);
diff --git a/map/framework.hpp b/map/framework.hpp
index 48191cb773..88fe1e7d74 100644
--- a/map/framework.hpp
+++ b/map/framework.hpp
@@ -565,8 +565,8 @@ public:
   typedef function<void(routing::IRouter::ResultCode, vector<storage::TIndex> const &,
                         vector<storage::TIndex> const &)> TRouteBuildingCallback;
   typedef function<void(float)> TRouteProgressCallback;
-  void SetRouteBuildingListener(TRouteBuildingCallback const & buildingCallback,
-                                TRouteProgressCallback const & progressCallback);
+  void SetRouteBuildingListener(TRouteBuildingCallback const & buildingCallback) { m_routingCallback = buildingCallback; }
+  void SetRouteProgressListener(TRouteProgressCallback const & progressCallback) { m_progressCallback = progressCallback; }
   void FollowRoute() { GetLocationState()->StartRouteFollow(); }
   void CloseRouting();
   void GetRouteFollowingInfo(location::FollowingInfo & info) { m_routingSession.GetRouteFollowingInfo(info); }
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index c121b24540..bb85dd4af8 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -104,7 +104,7 @@ namespace qt
 
     m_framework->SetRouteBuildingListener([] (routing::IRouter::ResultCode, vector<storage::TIndex> const &, vector<storage::TIndex> const &)
     {
-    }, nullptr);
+    });
   }
 
   DrawWidget::~DrawWidget()
diff --git a/routing/routing_session.hpp b/routing/routing_session.hpp
index 90b9323de6..9c8973541d 100644
--- a/routing/routing_session.hpp
+++ b/routing/routing_session.hpp
@@ -107,6 +107,8 @@ private:
     void operator()(Route & route, IRouter::ResultCode e);
   };
 
+  void AssignRoute(Route & route, IRouter::ResultCode e);
+
   //TODO (ldragunov) Make consistent DoReady and DoProgress callbacks. Now DoReady runs
   // GUI proc inside caller function, and DoProgressCallback calls it inside callback wrapper.
   struct DoProgressCallback