diff --git a/Helios/Source/ConfiguratorService.cs b/Helios/Source/ConfiguratorService.cs
index ce47bfabef544c38d7f18b934640da554e1f56f1..fa2d06a6d691abb5bd476051bd05cbcb0b16e23e 100644
--- a/Helios/Source/ConfiguratorService.cs
+++ b/Helios/Source/ConfiguratorService.cs
@@ -35,8 +35,8 @@ namespace Helios.Source
 					result.RoofAngle = roof.Elevation;
 					result.PanelEfficiency = panel.Efficiency * 100;
 					result.InstallationCost = panel.GetInstallationCost(roof.Area);
-					result.PowerGeneratedSummer = Math.Round(panel.GetPowerOutput(roof.Area, summerElevationAngle), 2);
-					result.PowerGeneratedWinter = Math.Round(panel.GetPowerOutput(roof.Area, winterElevationAngle), 2);
+					result.PowerGeneratedSummer = Math.Round(panel.GetPowerOutput(1000, roof.Area, summerElevationAngle), 2);
+					result.PowerGeneratedWinter = Math.Round(panel.GetPowerOutput(1000, roof.Area, winterElevationAngle), 2);
 					result.GeneratesRequiredPower = GeneratesRequiredPower(input.PowerRequired, result.PowerGeneratedWinter);
 					result.ExceedsMaximumPower = ExceedsPowerLimit(input.MaximumPower, result.PowerGeneratedWinter);
 					result.WithinBudget = WithinBudget(input.Budget, result.InstallationCost);
diff --git a/Helios/Source/SolarPanel.cs b/Helios/Source/SolarPanel.cs
index e2a09a3e0de9ef948c21a8e72eda5e15fe0ad78d..0e8e59df3c1fbb1f46be1d5e96b9bf8464e3edfb 100644
--- a/Helios/Source/SolarPanel.cs
+++ b/Helios/Source/SolarPanel.cs
@@ -31,11 +31,12 @@ namespace Helios.Source
             return installationCost;
         }
 
-        public double GetPowerOutput(double roofArea, int roofElevation)
+
+        public double GetPowerOutput(int solarEnergy, double roofArea, int roofElevation)
         {
             double powerOutput;
 
-            powerOutput = Efficiency * 1000 * roofArea * Math.Sin(roofElevation);
+            powerOutput = Efficiency * solarEnergy * roofArea * Math.Sin(roofElevation);
 
             this.PowerOutput = powerOutput;