diff --git a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
index 8336fcfe192b74441d1d224ef1fe600b97dd0bae..f1920d28f54bea38a24e1ba3a97a03424b002513 100644
--- a/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
+++ b/VECTOAux/VectoAuxiliaries/AdvancedAuxiliaries.vb
@@ -173,7 +173,7 @@ Public Class AdvancedAuxiliaries
         M10 = New M10(M3, M9, Signals)
         M11 = New M11(M1, M3, M6, M8, fuelMap, Signals)
         M12 = New M12(M10, M11, Signals)
-        M13 = New M13(M1, M10, M12, Signals)
+        M13 = New M13(M10, M11, M12, Signals)
         M14 = New M14(M13, ssmToolModule14, hvacConstants, Signals)
 
 
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
index b49a305876e9f2244e4276c97fd5b9cfee6dbc15..780111ee8453857e663186ae912be8277c7a5003 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M10.vb
@@ -136,7 +136,7 @@ Namespace DownstreamModules
 
                 'SCHM 3_02
                 Dim intrp1 As Single = Interpolate(InterpolationType.NonSmartPneumtaics)
-                intrp1 = If(Not Single.IsNaN(intrp1), intrp1, 0)
+                'intrp1 = If(Not Single.IsNaN(intrp1), intrp1, 0)
                 Return intrp1
 
             End Get
@@ -146,7 +146,7 @@ Namespace DownstreamModules
 
                 'SCHM 3_02
                 Dim intrp2 As Single = Interpolate(InterpolationType.SmartPneumtaics)
-                intrp2 = If(Not Single.IsNaN(intrp2), intrp2, 0)
+                'intrp2 = If(Not Single.IsNaN(intrp2), intrp2, 0)
                 Return intrp2
 
             End Get
diff --git a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
index b9648c33a4a682b197531f350d6f51bf88c4c84f..cfd161a5e151e6e86c1425ef571105f03838dcf8 100644
--- a/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
+++ b/VECTOAux/VectoAuxiliaries/DownstreamModules/M13.vb
@@ -15,84 +15,103 @@ Imports VectoAuxiliaries.Hvac
 
 Namespace DownstreamModules
 
-   Public Class M13
-      Implements IM13
-
-     Private m1  As IM1_AverageHVACLoadDemand
-     Private m10 As IM10
-     Private m12 As IM12
-     Private signals As ISignals
-     
-     'Internal Staging Calculations
-     Private readonly Property Sum1 As Single
-    Get
-                Return -m12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand + m12.BaseFuelConsumptionWithTrueAuxiliaryLoads
-    End Get
-End Property
-     Private readonly Property Sum2 As Single
-    Get
-                Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads - m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand
-    End Get
-End Property
-     Private readonly Property Sum3 As Single
-    Get
-                Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads - Sum2
-    End Get
-End Property
-     Private readonly Property Sum4 As Single
-    Get
-     Return -Sum1+Sum3
-    End Get
-End Property
-
-    'Sums 5, 6 and 7 removed during V06 implementation of the model
-     Private ReadOnly Property Sum8 As Single
-      Get
-      Return SW4 * SW3
-       End Get
-     End Property
-
-     'Internal Staging Switches
-     Private readonly Property SW1 As Single
-    Get
-      Return If( signals.SmartPneumatics,Sum4,m12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand)
-    End Get
-End Property
-     private readonly Property SW2 as Single
-    Get
-                Return If(signals.SmartPneumatics, m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand, m12.BaseFuelConsumptionWithTrueAuxiliaryLoads)
-    End Get
-End Property
-     Private readonly Property SW3 As Single
-    Get
-     Return If( signals.SmartElectrics, SW1, SW2)
-    End Get
-End Property
-     Private ReadOnly Property SW4 As single
-    Get
-      Return If( signals.DeclarationMode, signals.WHTC,1)
-    End Get
-End Property
-
-     'Constructor
-     Public Sub new ( m1 As IM1_AverageHVACLoadDemand, m10 As IM10, m12 As IM12 , signals As ISignals)
-
-      Me.m1      =  m1
-      Me.m10     =  m10
-      Me.m12     =  m12 
-      Me.signals =  signals
-                          
-End Sub
-
-     'Public class outputs
-     Public ReadOnly Property WHTCTotalCycleFuelConsumptionGrams As Single Implements IM13.WHTCTotalCycleFuelConsumptionGrams
+    Public Class M13
+        Implements IM13
+
+        Private m10 As IM10
+        Private m11 As IM11
+        Private m12 As IM12
+        Private signals As ISignals
+
+        'Internal Staging Calculations
+
+        Private ReadOnly Property Sum1 As Single
+            Get
+                Return m11.TotalCycleFuelConsuptionAverageLoads * m12.StopStartCorrection
+            End Get
+        End Property
+        Private ReadOnly Property Sum2 As Single
+            Get
+                Return m10.AverageLoadsFuelConsumptionInterpolatedForPneumatics * m12.StopStartCorrection
+            End Get
+        End Property
+        Private ReadOnly Property Sum3 As Single
+            Get
+                Return m10.FuelConsumptionSmartPneumaticsAndAverageElectricalPowerDemand * m12.StopStartCorrection
+            End Get
+        End Property
+        Private ReadOnly Property Sum4 As Single
+            Get
+                Return -m12.FuelconsumptionwithsmartElectricsandAveragePneumaticPowerDemand + Sum1
+            End Get
+        End Property
+        Private ReadOnly Property Sum5 As Single
+            Get
+                Return Sum2 - Sum3
+            End Get
+        End Property
+        Private ReadOnly Property Sum6 As Single
+            Get
+                Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads - Sum4
+            End Get
+        End Property
+        Private ReadOnly Property Sum7 As Single
+            Get
+                Return m12.BaseFuelConsumptionWithTrueAuxiliaryLoads - Sum5
+            End Get
+        End Property
+        Private ReadOnly Property Sum8 As Single
+            Get
+                Return -Sum4 + Sum7
+            End Get
+        End Property
+        Private ReadOnly Property Sum9 As Single
+            Get
+                Return SW4 * SW3
+            End Get
+        End Property
+
+        'Internal Staging Switches
+        Private ReadOnly Property SW1 As Single
+            Get
+                Return If(signals.SmartPneumatics, Sum8, Sum6)
+            End Get
+        End Property
+        Private ReadOnly Property SW2 As Single
+            Get
+                Return If(signals.SmartPneumatics, Sum3, m12.BaseFuelConsumptionWithTrueAuxiliaryLoads)
+            End Get
+        End Property
+        Private ReadOnly Property SW3 As Single
+            Get
+                Return If(signals.SmartElectrics, SW1, SW2)
+            End Get
+        End Property
+        Private ReadOnly Property SW4 As Single
+            Get
+                Return If(signals.DeclarationMode, signals.WHTC, 1)
+            End Get
+        End Property
+
+        'Constructor
+        Public Sub New(m10 As IM10, m11 As IM11, m12 As IM12, signals As ISignals)
+
+            Me.m10 = m10
+            Me.m11 = m11
+            Me.m12 = m12
+            Me.signals = signals
+
+        End Sub
+
+        'Public class outputs
+        Public ReadOnly Property WHTCTotalCycleFuelConsumptionGrams As Single Implements IM13.WHTCTotalCycleFuelConsumptionGrams
             Get
-          Return Sum8
+                Return Sum9
             End Get
         End Property
 
 
-   End Class
+    End Class
 
 End Namespace