diff --git a/pokemongo_bot/polyline_stepper.py b/pokemongo_bot/polyline_stepper.py
index 32d07fc1c9..fa91e51969 100644
--- a/pokemongo_bot/polyline_stepper.py
+++ b/pokemongo_bot/polyline_stepper.py
@@ -1,56 +1,41 @@
 # -*- coding: utf-8 -*-
 from polyline_walker import PolylineWalker
 from stepper import Stepper
-from human_behaviour import sleep, random_lat_long_delta
+from math import ceil
+from human_behaviour import sleep
+from cell_workers.utils import i2f
 
+import logger
 
 class PolylineStepper(Stepper):
 
     def _walk_to(self, speed, lat, lng, alt):
-        origin = ','.join([str(self.api._position_lat), str(self.api._position_lng)])
+        origin = ','.join([str(i2f(self.api._position_lat)), str(i2f(self.api._position_lng))])
         destination = ','.join([str(lat), str(lng)])
-        polyline_walker = PolylineWalker(origin, destination, self.speed)
+        polyline_walker = PolylineWalker(origin, destination, speed)
         proposed_origin = polyline_walker.points[0]
         proposed_destination = polyline_walker.points[-1]
         proposed_lat = proposed_origin[0]
         proposed_lng = proposed_origin[1]
         if proposed_lat != lat and proposed_lng != lng:
+            logger.log('[#] Using _old_walk_to to go to the proposed_origin: {}'
+                       .format(proposed_origin))
             self._old_walk_to(speed, proposed_lat, proposed_lng, alt)
-        while proposed_destination != polyline_walker.get_pos()[0]:
-            cLat, cLng = polyline_walker.get_pos()[0]
-            self.api.set_position(cLat, cLng, alt)
-            self.bot.heartbeat()
-            self._work_at_position(i2f(self.api._position_lat), i2f(self.api._position_lng), alt, False)
-            sleep(1)  # sleep one second plus a random delta
-        if proposed_lat != self.api._position_lat and proposed_lng != self.api._position_lng:
-            self._old_walk_to(speed, lat, lng, alt)
-
-    def _old_walk_to(self, speed, lat, lng, alt):
-        dist = distance(
-            i2f(self.api._position_lat), i2f(self.api._position_lng), lat, lng)
-        steps = (dist + 0.0) / (speed + 0.0)  # may be rational number
-        intSteps = int(steps)
-        residuum = steps - intSteps
-        logger.log('[#] Walking from ' + str((i2f(self.api._position_lat), i2f(
-            self.api._position_lng))) + " to " + str(str((lat, lng))) +
-                   " for approx. " + str(format_time(ceil(steps))))
-        if steps != 0:
-            dLat = (lat - i2f(self.api._position_lat)) / steps
-            dLng = (lng - i2f(self.api._position_lng)) / steps
-
-            for i in range(intSteps):
-                cLat = i2f(self.api._position_lat) + \
-                    dLat + random_lat_long_delta()
-                cLng = i2f(self.api._position_lng) + \
-                    dLng + random_lat_long_delta()
+        if proposed_origin != proposed_destination:
+            duration = polyline_walker.get_total_distance() / speed
+            logger.log('[#] Using PolylineWalker from {} to {} for approx. {} seconds.'
+                       .format(proposed_origin, proposed_destination, ceil(duration)))
+            while proposed_destination != polyline_walker.get_pos()[0]:
+                cLat, cLng = polyline_walker.get_pos()[0]
                 self.api.set_position(cLat, cLng, alt)
                 self.bot.heartbeat()
+                self._work_at_position(i2f(self.api._position_lat), i2f(self.api._position_lng), alt, False)
                 sleep(1)  # sleep one second plus a random delta
-                self._work_at_position(
-                    i2f(self.api._position_lat), i2f(self.api._position_lng),
-                    alt, False)
+        if proposed_lat != self.api._position_lat and proposed_lng != self.api._position_lng:
+            logger.log('[#] Using _old_walk_to to go from the proposed destination : {} to {}'
+                       .format(proposed_destination, (lat, lng)))
 
-            self.api.set_position(lat, lng, alt)
-            self.bot.heartbeat()
-            logger.log("[#] Finished walking")
+            self._old_walk_to(speed, lat, lng, alt)
 
+    def _old_walk_to(self, speed, lat, lng, alt):
+        return super(PolylineStepper, self)._walk_to(speed, lat, lng, alt)
diff --git a/pokemongo_bot/polyline_walker/polyline_walker.py b/pokemongo_bot/polyline_walker/polyline_walker.py
index e6a92c1c5e..ed82f311dd 100644
--- a/pokemongo_bot/polyline_walker/polyline_walker.py
+++ b/pokemongo_bot/polyline_walker/polyline_walker.py
@@ -85,7 +85,7 @@ def get_pos(self):
     def calculate_coord(self, percentage, o, d):
         lat = o[0]+ (d[0] -o[0]) * percentage
         lon = o[1]+ (d[1] -o[1]) * percentage
-        return [(round(lat, 5), round(lon, 5))]
+        return [(lat, lon)]
 
     def get_total_distance(self):
         return ceil(sum([haversine.haversine(*x)*1000 for x in self.walk_steps()]))