diff --git a/core/AEConfig.java b/core/AEConfig.java
index 2bdd78c0..383b1b58 100644
--- a/core/AEConfig.java
+++ b/core/AEConfig.java
@@ -24,6 +24,7 @@ import appeng.util.IConfigManagerHost;
 import appeng.util.Platform;
 import cpw.mods.fml.client.event.ConfigChangedEvent;
 import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 
@@ -49,6 +50,8 @@ public class AEConfig extends Configuration implements IConfigureableObject, ICo
 	public int storageBiomeID = -1;
 	public int storageProviderID = -1;
 
+	public int formationPlaneEntityLimit = 128;
+
 	public float spawnChargedChance = 0.92f;
 	public int quartzOresPerCluster = 4;
 	public int quartzOresClusterAmount = 15;
@@ -253,6 +256,8 @@ public class AEConfig extends Configuration implements IConfigureableObject, ICo
 		WirelessTerminalDrainMultiplier = get( "wireless", "WirelessTerminalDrainMultiplier", WirelessTerminalDrainMultiplier ).getDouble(
 				WirelessTerminalDrainMultiplier );
 
+		formationPlaneEntityLimit = get( "automation", "formationPlaneEntityLimit", formationPlaneEntityLimit ).getInt( formationPlaneEntityLimit );
+
 		wireless_battery = get( "battery", "wireless", wireless_battery ).getInt( wireless_battery );
 		staff_battery = get( "battery", "staff", staff_battery ).getInt( staff_battery );
 		manipulator_battery = get( "battery", "manipulator", manipulator_battery ).getInt( manipulator_battery );
diff --git a/parts/automation/PartFormationPlane.java b/parts/automation/PartFormationPlane.java
index dae636bc..0dd60e22 100644
--- a/parts/automation/PartFormationPlane.java
+++ b/parts/automation/PartFormationPlane.java
@@ -47,6 +47,7 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.api.util.IConfigManager;
 import appeng.client.texture.CableBusTextures;
+import appeng.core.AEConfig;
 import appeng.core.sync.GuiBridge;
 import appeng.helpers.IPriorityHost;
 import appeng.me.GridAccessException;
@@ -111,6 +112,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
 		{
 			wasActive = currentActive;
 			updateHandler();// proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() );
+			getHost().markForUpdate();
 		}
 	}
 
@@ -122,6 +124,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
 		{
 			wasActive = currentActive;
 			updateHandler();// proxy.getGrid().postEvent( new MENetworkCellArrayUpdate() );
+			getHost().markForUpdate();
 		}
 	}
 
@@ -449,7 +452,7 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
 				for (List Z : c.entityLists)
 					sum += Z.size();
 
-				if ( sum < 32 )
+				if ( sum < AEConfig.instance.formationPlaneEntityLimit )
 				{
 					if ( type == Actionable.MODULATE )
 					{