diff --git a/Calculator.java b/Calculator.java
index 24dc9f2..a34e148 100644
--- a/Calculator.java
+++ b/Calculator.java
@@ -157,9 +157,12 @@ public class Calculator {
 
     //windchill in graden Celcius
 	//Janco en Keneth
-    public static double windChill(short gradenFahrenheit, short mijlPerUur)
+    public static double windChill(short grdnFh, short mph)
     {
-        short windChill = (short) (35.74 + (0.6215*gradenFahrenheit) - 35.75*Math.pow(mijlPerUur, 0.16) + 0.4275*gradenFahrenheit*Math.pow(mijlPerUur, 0.16));
+        double gradenFahrenheit = grdnFh;
+        double mijlPerUur = mph;
+        double windChill2 = (35.74 + (0.6215*gradenFahrenheit) - 35.75*Math.pow(mijlPerUur, 0.16) + 0.4275*gradenFahrenheit*Math.pow(mijlPerUur, 0.16));
+        short windChill = (short) windChill2;
         return temperatuur(windChill);
     }
     
diff --git a/Measurement.java b/Measurement.java
index de7f7a3..9baedec 100644
--- a/Measurement.java
+++ b/Measurement.java
@@ -110,7 +110,7 @@ public class Measurement
     public String getSunset () { return Calculator.sunSet(sunset); };
     
     // windChill
-    public double getWindChill () { return round(Calculator.windChill(outsideTemp, windSpeed),2); };
+    public double getWindChill () { return round(Calculator.windChill(outsideTemp, avgWindSpeed),2); };
      
     // heatIndex
     public double getHeatIndex () { return round(Calculator.heatIndex(outsideHum, outsideTemp),0); };