diff --git a/Assets/Font/typo-stratum/__MACOSX.meta b/Assets/Font/typo-stratum/__MACOSX.meta
deleted file mode 100644
index 5596957..0000000
--- a/Assets/Font/typo-stratum/__MACOSX.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 76087783dd84b37478e6ad0446da7f2c
-folderAsset: yes
-timeCreated: 1520975305
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/GameScene/BikeManager.cs b/Assets/Scripts/GameScene/BikeManager.cs
index c9db168..7d15d15 100644
--- a/Assets/Scripts/GameScene/BikeManager.cs
+++ b/Assets/Scripts/GameScene/BikeManager.cs
@@ -39,7 +39,8 @@ public class BikeManager : MonoBehaviour {
 	void Start () {
         distanceToRun = gm.GetRaceDistance();
 
-        taco = gameObject.AddComponent<RAWTachometer>();
+        //taco = gameObject.AddComponent<RAWTachometer>();
+        taco = gameObject.AddComponent<PreciseTachometer>();
         taco.SetPlayer(playerID);
 
         normalSpeed = distanceToRun / gm.GetRaceNormalTime();
diff --git a/Assets/Scripts/GameScene/PreciseTachometer.cs b/Assets/Scripts/GameScene/PreciseTachometer.cs
new file mode 100644
index 0000000..d9be94d
--- /dev/null
+++ b/Assets/Scripts/GameScene/PreciseTachometer.cs
@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System.Linq;
+
+public class PreciseTachometer : Tachometer {
+
+    public float delta = 1f;
+    public int sampleCount = 2;
+
+    public override float GetSpeed() {
+        if (impulses.Count < sampleCount)
+            return 0f;
+        var samples = impulses.Skip(impulses.Count - sampleCount);
+        float deltaT = samples.Last() - samples.First();
+
+        float deltaT2 = Time.time - samples.Last();
+        if (deltaT2 > deltaT)
+            deltaT = deltaT2;
+
+        return distancePerTick * (sampleCount - 1) / deltaT;
+    }
+
+}
+
diff --git a/Assets/Scripts/GameScene/PreciseTachometer.cs.meta b/Assets/Scripts/GameScene/PreciseTachometer.cs.meta
new file mode 100644
index 0000000..449bbb4
--- /dev/null
+++ b/Assets/Scripts/GameScene/PreciseTachometer.cs.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+guid: bdffdeda5fff446daa9f7200d2c0d343
+timeCreated: 1521093088
+licenseType: Free
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: