diff --git a/ErgometerSimulator/ErgometerSimulator/CommandParser.cs b/ErgometerSimulator/ErgometerSimulator/CommandParser.cs
index 5210276..58d0983 100644
--- a/ErgometerSimulator/ErgometerSimulator/CommandParser.cs
+++ b/ErgometerSimulator/ErgometerSimulator/CommandParser.cs
@@ -25,6 +25,7 @@ namespace ErgometerSimulator
                 case "CM":
                 case "RS":
                     response = "ACK";
+                    dg.Reset();
                     break;
                 case "ST":
                     response += dg.HeartBeat.currentvalue  + "\t"; //Heartbeat
@@ -42,7 +43,7 @@ namespace ErgometerSimulator
             if (input.StartsWith("PT"))
             {
                 dg.Time.currentvalue = int.Parse(input.Substring(3, 2)) * 60 + int.Parse(input.Substring(5, 2));
-                dg.Time.value1 = int.Parse(input.Substring(3,2)) * 60 + int.Parse(input.Substring(5,2));
+                dg.Time = new ValueSetting(true, int.Parse(input.Substring(3, 2)) * 60 + int.Parse(input.Substring(5, 2)), 0);
                 Console.WriteLine(dg.Time.currentvalue);
             }
             else if (input.StartsWith("PD"))
diff --git a/ErgometerSimulator/ErgometerSimulator/DataGenerator.cs b/ErgometerSimulator/ErgometerSimulator/DataGenerator.cs
index e919849..13f00d5 100644
--- a/ErgometerSimulator/ErgometerSimulator/DataGenerator.cs
+++ b/ErgometerSimulator/ErgometerSimulator/DataGenerator.cs
@@ -36,7 +36,19 @@ namespace ErgometerSimulator
             lastTime = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
         }
 
-        
+        public void Reset()
+        {
+            HeartBeat = new ValueSetting(false, 0, 0);
+            RPM = new ValueSetting(false, 0, 0);
+            Speed = new ValueSetting(false, 0, 0);
+            Distance = new ValueSetting(false, 0, 0);
+            Power = new ValueSetting(false, 0, 0);
+            Energy = new ValueSetting(false, 0, 0);
+            ActualPower = new ValueSetting(false, 0, 0);
+            Time = new ValueSetting(false, 0, 0);
+
+            lastTime = (DateTime.Now - DateTime.Parse("1/1/1870 0:0:0")).TotalMilliseconds;
+        }
 
         public void Update()
         {