diff --git a/src/svea_core/src/svea/sensors.py b/src/svea_core/src/svea/sensors.py
index 57173713..6f5e7715 100644
--- a/src/svea_core/src/svea/sensors.py
+++ b/src/svea_core/src/svea/sensors.py
@@ -154,15 +154,21 @@ def __init__(self,
         self.axle_track = axle_track * mm_to_meter
         self.wheel_radius = wheel_radius
         self.ticks_per_revolution = ticks_per_revolution
-        self.tick_to_distance_coefficient = (
-            wheel_radius * tau * mm_to_meter / ticks_per_revolution
-        )
+        self.tick_to_distance_coefficient = (wheel_radius * tau * mm_to_meter / ticks_per_revolution)
+        self.direction_epsilon = self.tick_to_distance_coefficient * 0.5 # m/s
         # Storage fields
         self.direction = 1
         self.linear_velocity = 0.0
         self.angular_velocity = 0.0
         self.r_wheel_velocity = 0.0
         self.l_wheel_velocity = 0.0
+        self.running_average_linear = 0.0
+        self.running_average_angular = 0.0
+        self.right_wheel_velocity = 0.0
+        self.left_wheel_velocity = 0.0
+        self.alpha = 2/(10+1) 
+        self.encoder_time_scale = 1e-6 # in micros
+        self.threshold = 1e-5
         # list of functions to call whenever a new reading comes in
         self.callbacks = []
 
@@ -209,32 +215,40 @@ def _process_encoder_data(self, msg):
             msg.left_ticks,
             msg.left_time_delta)
         direction = self.direction
+
+        self.right_wheel_velocity = self.alpha*right_wheel_velocity + (1-self.alpha)*self.right_wheel_velocity
+        self.left_wheel_velocity = self.alpha*left_wheel_velocity + (1-self.alpha)*self.left_wheel_velocity
+        
         # Linear velocity
-        self.linear_velocity = (right_wheel_velocity + left_wheel_velocity)/2
+        self.linear_velocity = (self.right_wheel_velocity + self.left_wheel_velocity)/2
+        self.running_average_linear = self.alpha*self.linear_velocity + (1-self.alpha)*self.running_average_linear
         self.linear_velocity *= direction
+        if -self.threshold < self.running_average_linear < self.threshold:
+            self.linear_velocity = 0.0
+
         # Angular velocity
-        angular_velocity = (right_wheel_velocity - left_wheel_velocity)
-        angular_velocity /= self.axle_track
-        angular_velocity *= direction
-        self.angular_velocity = angular_velocity
+        self.angular_velocity = (self.right_wheel_velocity - self.left_wheel_velocity)/self.axle_track
+        self.running_average_angular = self.alpha*self.angular_velocity + (1-self.alpha)*self.running_average_angular
+        if -self.threshold < self.angular_velocity < self.threshold:
+            self.angular_velocity = 0.0
+
         for cb in self.callbacks:
             cb(self)
 
     def _process_direction(self, msg):
         velocity = msg.twist.twist.linear.x
-        direction_epsilon = self.tick_to_distance_coefficient * 0.5 # m/s
-        if velocity > direction_epsilon:
+        if velocity > self.direction_epsilon:
             self.direction = 1
-        elif velocity < direction_epsilon:
+        elif velocity < -self.direction_epsilon:
             self.direction = -1
         else:
-            self.directions = 0
+            self.direction = 0
 
     def _calc_wheel_velocity(self, ticks, time_delta):
         if time_delta == 0:
             return 0
         distance = ticks * self.tick_to_distance_coefficient
-        velocity = (distance/time_delta) * 1e6
+        velocity = (distance/(time_delta * self.encoder_time_scale))
         return velocity
 
     def add_callback(self, cb):
diff --git a/src/svea_sensors/params/robot_localization/global_ekf.yaml b/src/svea_sensors/params/robot_localization/global_ekf.yaml
index ad412183..d496ebe0 100644
--- a/src/svea_sensors/params/robot_localization/global_ekf.yaml
+++ b/src/svea_sensors/params/robot_localization/global_ekf.yaml
@@ -91,7 +91,7 @@ twist1: /wheel_encoder_twist
 twist1_config: [false, false, false,
                 false, false, false,
                 true,  false, false,
-                false, false, true,
+                false, false, false,
                 false, false, false]
 twist1_nodelay: true
 twist1_differential: true
diff --git a/src/svea_sensors/params/robot_localization/local_ekf.yaml b/src/svea_sensors/params/robot_localization/local_ekf.yaml
index e43edf55..685633bd 100644
--- a/src/svea_sensors/params/robot_localization/local_ekf.yaml
+++ b/src/svea_sensors/params/robot_localization/local_ekf.yaml
@@ -92,7 +92,7 @@ twist1: /wheel_encoder_twist
 twist1_config: [false, false, false,
                 false, false, false,
                 true,  false, false,
-                false, false, true,
+                false, false, false,
                 false, false, false]
 twist1_nodelay: true
 twist1_differential: true
diff --git a/src/svea_sensors/scripts/wheel_encoder_reader.py b/src/svea_sensors/scripts/wheel_encoder_reader.py
index 230461d5..e36d6397 100755
--- a/src/svea_sensors/scripts/wheel_encoder_reader.py
+++ b/src/svea_sensors/scripts/wheel_encoder_reader.py
@@ -21,8 +21,8 @@
 # Axle track in mm
 DEFAULT_AXLE_TRACK = 199.0
 # Wheel radius in mm
-DEFAULT_WHEEL_RADIUS = 60.0
-TICKS_PER_REVOLUTION = 60
+DEFAULT_WHEEL_RADIUS = 59.0
+TICKS_PER_REVOLUTION = 80
 
 DEFAULT_LINEAR_COVARIANCE = 0.2
 DEFAULT_ANGULAR_COVARIANCE = 0.4