diff --git a/Signal Generator/DrawTask.cs b/Signal Generator/DrawTask.cs
index 933742e..1cffceb 100644
--- a/Signal Generator/DrawTask.cs	
+++ b/Signal Generator/DrawTask.cs	
@@ -54,20 +54,21 @@ namespace Signal_Generator
         private void drawSignalAtCanvas()
         {
             double lastX = 0, lastY = 0;
-            double w = canvas.ActualWidth;
-            for (int i = 0; i != (int)w; i++)
+            double W = canvas.ActualWidth;
+            double mod = (procedureModel.Duration / 1000) / W;
+            for (int X = 0; X != (int)W; X++)
             {
-                updateTextBoxProps(multiSignal.currentAmplitude(i / 5.0), i / 5.0);
-                double y = multiSignal.currentAmplitude(i / 5.0);
-                drawLine(lastX, lastY, i, y);
-                lastX = i;
-                lastY = y;
+                double Y = multiSignal.currentAmplitude(X * mod);
+                updateTextBoxProps(Y, X * mod);
+                drawLine(lastX, lastY, X, Y);
+                lastX = X;
+                lastY = Y;
                 Thread.Sleep(10);
                 switch (state)
                 {
                     case State.Paused:
                         while (state == State.Paused)
-                            Thread.Sleep(10);
+                            Thread.Sleep(50);
                         break;
                     case State.Canceled: return;
                 }
diff --git a/Signal Generator/ProcedureModel.cs b/Signal Generator/ProcedureModel.cs
index ea6367f..776ec25 100644
--- a/Signal Generator/ProcedureModel.cs	
+++ b/Signal Generator/ProcedureModel.cs	
@@ -168,7 +168,7 @@ namespace Signal_Generator
             }
         }
 
-        private double duration;
+        private double duration = 1000;
         public double Duration
         {
             get { return duration; }
diff --git a/Signal Generator/Signal/FmSignal.cs b/Signal Generator/Signal/FmSignal.cs
index 8f0e190..c447b6f 100644
--- a/Signal Generator/Signal/FmSignal.cs	
+++ b/Signal Generator/Signal/FmSignal.cs	
@@ -27,7 +27,7 @@ namespace Signal_Generator
         public double currentAmplitude(double t)
         {
             var c = paramsCollection.ToArray<Parameter>();
-            return c[0].value * Math.Sin(2 * 3.14 * c[1].value* t + c[2].value * Math.Sin(t));
+            return c[0].value * Math.Sin(2 * 3.14 * c[1].value * t + c[2].value * Math.Sin(t));
         }
     }
 }
diff --git a/Signal Generator/Signal/SinusoidalSignal.cs b/Signal Generator/Signal/SinusoidalSignal.cs
index da1ec6b..ade3171 100644
--- a/Signal Generator/Signal/SinusoidalSignal.cs	
+++ b/Signal Generator/Signal/SinusoidalSignal.cs	
@@ -27,7 +27,7 @@ namespace Signal_Generator
         public double currentAmplitude(double t)
         {
             var c = paramsCollection.ToArray<Parameter>();
-            return c[0].value * Math.Sin(2.0 * 3.14 * c[1].value * t + c[2].value);
+            return c[0].value * Math.Sin(2.0 * 3.14 * c[1].value * t + c[2].value * 180 / 3.14);
         }
     }
 }