diff --git a/_alp/Agents/EnergyCoop/Code/Functions.java b/_alp/Agents/EnergyCoop/Code/Functions.java
index 36cde390..2f7c1b68 100644
--- a/_alp/Agents/EnergyCoop/Code/Functions.java
+++ b/_alp/Agents/EnergyCoop/Code/Functions.java
@@ -1230,13 +1230,15 @@
 
 //Loop over membered grid connections
 for(GridConnection GC : c_memberGridConnections){
-	//Add self consumption of gc individually
-	v_cumulativeIndividualSelfconsumptionElectricity_MWh += GC.v_rapidRunData.getTotalElectricitySelfConsumed_MWh();
-	v_cumulativeIndividualSelfconsumptionEnergy_MWh += GC.v_rapidRunData.getTotalEnergySelfConsumed_MWh();
-	
-	//Add all peaks for member grid connections
-	v_cumulativeIndividualPeakDelivery_kW += GC.v_rapidRunData.getPeakDelivery_kW();
-	v_cumulativeIndividualPeakFeedin_kW += GC.v_rapidRunData.getPeakFeedin_kW();	
+	if(GC.v_isActive){
+		//Add self consumption of gc individually
+		v_cumulativeIndividualSelfconsumptionElectricity_MWh += GC.v_rapidRunData.getTotalElectricitySelfConsumed_MWh();
+		v_cumulativeIndividualSelfconsumptionEnergy_MWh += GC.v_rapidRunData.getTotalEnergySelfConsumed_MWh();
+		
+		//Add all peaks for member grid connections
+		v_cumulativeIndividualPeakDelivery_kW += GC.v_rapidRunData.getPeakDelivery_kW();
+		v_cumulativeIndividualPeakFeedin_kW += GC.v_rapidRunData.getPeakFeedin_kW();
+	}	
 }
 
 //Add all max peaks of GC
diff --git a/_alp/Agents/GCGridBattery/Code/Functions.xml b/_alp/Agents/GCGridBattery/Code/Functions.xml
index 26e66798..09eda1aa 100644
--- a/_alp/Agents/GCGridBattery/Code/Functions.xml
+++ b/_alp/Agents/GCGridBattery/Code/Functions.xml
@@ -26,8 +26,8 @@
 		<ReturnType>double</ReturnType>
 		<Id>1666956527771</Id>
 		<Name><![CDATA[f_operateFlexAssets_overwrite]]></Name>
-		<X>800</X>
-		<Y>240</Y>
+		<X>910</X>
+		<Y>220</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -43,8 +43,8 @@
 		<Id>1666967854749</Id>
 		<Name><![CDATA[f_operateFixedConsumptionAssets_overwrite]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>800</X>
-		<Y>220</Y>
+		<X>910</X>
+		<Y>200</Y>
 		<Label>
 			<X>10</X>
 			<Y>0</Y>
@@ -108,7 +108,7 @@
 		<Id>1688369593905</Id>
 		<Name><![CDATA[f_calculateEnergyBalance_overwrite]]></Name>
 		<ExcludeFromBuild>true</ExcludeFromBuild>
-		<X>780</X>
+		<X>890</X>
 		<Y>180</Y>
 		<Label>
 			<X>10</X>