diff --git a/ErgometerIPR/ErgometerApplication/ErgometerTest.cs b/ErgometerIPR/ErgometerApplication/ErgometerTest.cs
index cc53943..2e9a0a4 100644
--- a/ErgometerIPR/ErgometerApplication/ErgometerTest.cs
+++ b/ErgometerIPR/ErgometerApplication/ErgometerTest.cs
@@ -15,6 +15,7 @@ namespace ErgometerApplication
 
         private enum state {WARMUP, WORKLOAD, COOLINGDOWN, STOP};
         private state currentstate;
+        private int currentPower;
         private int workloadStarted;
         private int workloadHearthbeat;
         private List<Workload> workloads;
@@ -35,12 +36,21 @@ namespace ErgometerApplication
             client.updateStepsText("U begint nu aan een warmup, probeer een tempo van 50 rpm aan te houden. De test gaat automatisch verder.");
 			workloads = new List<Workload>();
             MainClient.ComPort.Write("PW 25");
-
+            MainClient.ComPort.Read();
+            currentPower = 25;
             MainClient.Client.heartBeat.max = (int)CalculateMaximumHeartRate();
         }
 
         public void timerTick()
         {
+            if (MainClient.GetLastMeting().Seconds > 5 && currentPower != MainClient.GetLastMeting().Power)
+            {
+                MainClient.ComPort.Write("PW " + currentPower);
+                MainClient.ComPort.Read();
+                MainClient.QuickBeepAudio();
+            }
+
+
             switch(currentstate)
             {
                 case state.WARMUP:
@@ -77,11 +87,12 @@ namespace ErgometerApplication
                 case state.WORKLOAD:
                     if (MainClient.GetLastMeting().Seconds - workloadStarted > 180)
                     {
-                        int pw = GetWorkloadPower(GetCurrentWorkload());
+                        currentPower = GetWorkloadPower(GetCurrentWorkload());
                         workloads.Add(new Workload(MainClient.GetLastMeting().Power, workloadHearthbeat));
-                        MainClient.ComPort.Write("PW " + pw);
+                        MainClient.ComPort.Write("PW " + currentPower);
+                        MainClient.ComPort.Read();
 
-                        client.updateStepsText("U heeft de workload afgerond, u begint nu aan de " + NumToText(GetCurrentWorkload()) + " workload. Uw nieuwe weerstand is " + pw + " Watt.");
+                        client.updateStepsText("U heeft de workload afgerond, u begint nu aan de " + NumToText(GetCurrentWorkload()) + " workload. Uw nieuwe weerstand is " + currentPower + " Watt.");
                         MainClient.SwitchWorkloadAudio();
 
                         workloadStarted = MainClient.GetLastMeting().Seconds;
@@ -95,7 +106,10 @@ namespace ErgometerApplication
                             currentstate = state.COOLINGDOWN;
                             MainClient.SwitchTestModeAudio();
                             client.updateStepsText("Uw hartslag heeft het kritieke punt bereikt, we beginnen nu aan de cooldown.");
+                            
                             MainClient.ComPort.Write("PW 25");
+                            MainClient.ComPort.Read();
+                            currentPower = 25;
                         }
                     }
                     else if (MainClient.GetLastMeting().Seconds - workloadStarted > 160 && workloadHearthbeat == 0)
diff --git a/ErgometerIPR/ErgometerServer/DoctorThread.cs b/ErgometerIPR/ErgometerServer/DoctorThread.cs
index 8359a30..991079e 100644
--- a/ErgometerIPR/ErgometerServer/DoctorThread.cs
+++ b/ErgometerIPR/ErgometerServer/DoctorThread.cs
@@ -84,7 +84,6 @@ namespace ErgometerServer
                                 foreach(Tuple<int,string,double> session in sessions)
                                 {
                                     sendToDoctor(new NetCommand(session.Item2, session.Item3, session.Item1));
-                                    
                                     Thread.Sleep(10);
                                 }
                                 break;
diff --git a/README.md b/README.md
index a38724d..4f514b2 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@
 Ergometer IPR2 - Janco &amp; Kenneth
 
 ## Nog toevoegen
-- eindscherm
 - Checken of je harder of zachter moet fietsen met een pijltje en kleur text
 - Biepjes fixen (lengte langer gemaakt, maar weet niet zeker of het gefixed is)
-- Checken of power niet handmatig wordt aangepast
 - als te lang afgewijkt wordt van 50 rpm test stoppen