diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/Base.SC2Data/GameData/EffectData.xml b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/Base.SC2Data/GameData/EffectData.xml
new file mode 100644
index 000000000..e1f4363d1
--- /dev/null
+++ b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/Base.SC2Data/GameData/EffectData.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Catalog>
+    <CEffectDamage id="AP_ChainReaction2Damage">
+        <!-- Override -->
+        <Amount value="25"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_ChainReaction3Damage">
+        <!-- Override -->
+        <Amount value="25"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_ChainReaction4Damage">
+        <!-- Override -->
+        <Amount value="25"/>
+    </CEffectDamage>
+    <CEffectDamage id="AP_ChainReaction5Damage">
+        <!-- Override -->
+        <Amount value="25"/>
+    </CEffectDamage>
+</Catalog>
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/GameData.version b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/GameData.version
index 8519ca57e..932224153 100644
Binary files a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/GameData.version and b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/GameData.version differ
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/MapScript.galaxy b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/MapScript.galaxy
index 4506f6083..913ac8b2a 100644
--- a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/MapScript.galaxy
+++ b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/MapScript.galaxy
@@ -1572,6 +1572,7 @@ bool gt_Initialization_Func (bool testConds, bool runActions) {
         libABFE498B_gf_AP_Triggers_Zerg_KerriganChainReaction(gv_pLAYER_01_USER);
         libABFE498B_gf_AP_Triggers_Zerg_KerriganSpawnBanelings(gv_pLAYER_01_USER);
         libABFE498B_gf_AP_Triggers_Zerg_KerriganFury(gv_pLAYER_01_USER);
+        libABFE498B_gf_AP_Triggers_Zerg_KerriganPsionicShift(gv_pLAYER_01_USER);
     }
 
     libNtve_gf_SetUpgradeLevelForPlayer(gv_pLAYER_01_USER, "AP_KerriganPostZerus", 1);
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/PreloadAssetDB.txt b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/PreloadAssetDB.txt
index c7422a922..d182eb8c5 100644
--- a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/PreloadAssetDB.txt
+++ b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/PreloadAssetDB.txt
@@ -1,51 +1,61 @@
 [Actor]
-id=SpaceFallingDebris
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,SoundEmitter,TerrainMgr
+id=Blast_Craters_Big
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,SoundEmitter,TerrainMgr
 Model
 Sound=Doodad_##id##
-id=Blast_Craters_Big
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,SoundEmitter,TerrainMgr
+id=SpaceFallingDebris
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,SoundEmitter,TerrainMgr
 Model
 Sound=Doodad_##id##
 
+[Effect]
+id=AP_ChainReaction2Damage
+Actor=AP_ChainReaction2Attack,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_ChainReaction3Damage
+Actor=AP_ChainReaction3Attack,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_ChainReaction4Damage
+Actor=AP_ChainReaction4Attack,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+id=AP_ChainReaction5Damage
+Actor=AP_ChainReaction5Attack,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+
 [Game]
 id=Dflt
-Abil=stop
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Abil=LoadOutSpray,stop
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Behavior=AttackReveal
+Button=LoadOutSpray@1,LoadOutSpray@10,LoadOutSpray@11,LoadOutSpray@12,LoadOutSpray@13,LoadOutSpray@14,LoadOutSpray@2,LoadOutSpray@3,LoadOutSpray@4,LoadOutSpray@5,LoadOutSpray@6,LoadOutSpray@7,LoadOutSpray@8,LoadOutSpray@9
 Effect=SplashDamage
 Race=Prot,Terr,Zerg
 Sound=Zerg_CreepDecay,Zerg_CreepGrow
-Unit=BeaconArmy,BeaconAttack,BeaconAuto,BeaconClaim,BeaconCustom1,BeaconCustom2,BeaconCustom3,BeaconCustom4,BeaconDefend,BeaconDetect,BeaconExpand,BeaconHarass,BeaconIdle,BeaconRally,BeaconScout
 
 [Light]
 id=Typhon
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=Ulaan
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=THorner05SSecurityCam
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=THorner05SSecurityCam_Low
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=StarshipDark
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=UlnarInner
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 
 [Model]
 id=Beacon_ProtossSmall
-asset=Assets\Units\Test\InvisibleUnit\InvisibleUnit.m3
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+asset=Assets\UI\Feedback\BeaconProtoss\BeaconProtoss.m3
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Sound=UI_BeaconProtossDeath
 id=XelNagaColumn
 asset=Assets\Doodads\##id##\##id##.m3
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 
 [Terrain]
 id=UlnarInner
 path=Assets\Textures\.dds
 asset=Creep,CreepEdgeNormal_ex2,CreepHeight,CreepNoise,CreepSpecularMask
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Light
 Soundtrack=Ambience_PUlnar02_Quad
 TerrainTex=##id##1,##id##2,##id##3,##id##4,##id##5,##id##6,##id##7,##id##8
@@ -54,65 +64,65 @@ TerrainTex=##id##1,##id##2,##id##3,##id##4,##id##5,##id##6,##id##7,##id##8
 id=UlnarInner1
 path=Assets\Textures\.dds
 asset=UlnarInner_1,UlnarInner_1Normal,ulnarinner_1normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=RockMixUlnarInner
 PhysicsMaterial=MetalHeavy
 id=UlnarInner2
 path=Assets\Textures\.dds
 asset=UlnarInner_2,UlnarInner_2Normal,ulnarinner_2normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 PhysicsMaterial=MetalHeavy
 id=UlnarInner3
 path=Assets\Textures\.dds
 asset=UlnarInner_3,UlnarInner_3Normal,ulnarinner_3normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 PhysicsMaterial=MetalHeavy
 id=UlnarInner4
 path=Assets\Textures\.dds
 asset=UlnarInner_4,UlnarInner_4Normal,ulnarinner_4normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 PhysicsMaterial=Dirt
 id=UlnarInner5
 path=Assets\Textures\.dds
 asset=UlnarInner_5,UlnarInner_5Normal,ulnarinner_5normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 PhysicsMaterial=Dirt
 id=UlnarInner6
 path=Assets\Textures\.dds
 asset=UlnarInner_6,UlnarInner_6Normal,ulnarinner_6normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 PhysicsMaterial=MetalHeavy
 id=UlnarInner7
 path=Assets\Textures\.dds
 asset=UlnarInner_7,UlnarInner_7Normal,ulnarinner_7normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 PhysicsMaterial=MetalHeavy
 id=UlnarInner8
 path=Assets\Textures\.dds
 asset=UlnarInner_8,UlnarInner_8Normal,ulnarinner_8normal
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=RockMixUlnarInner
 PhysicsMaterial=MetalHeavy
 
 [Water]
 id=Agria
 asset=Assets\Textures\DefaultWater.dds
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=BelShirBeachShoreline,BelShirCliffShoreline,DefaultLava
 Sound=Emitter_WaterCalm
 id=BraxisAlpha
 asset=Assets\Textures\DefaultWater.dds
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=BelShirBeachShoreline,BelShirCliffShoreline,DefaultLava
 Sound=Emitter_WaterCalm
 id=PortZion
 asset=Assets\Textures\DefaultWater.dds
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=BelShirBeachShoreline,BelShirCliffShoreline,DefaultLava
 Sound=Emitter_WaterCalm
 id=ZerusPool
 asset=Assets\Textures\DefaultWater.dds
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
+Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Model=CharAcidBeachShoreline,CharAcidCliffShoreline,DefaultLava
 Sound=Emitter_WaterCalm
 
diff --git a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/Triggers b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/Triggers
index dfb717435..22315b09c 100644
--- a/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/Triggers
+++ b/Maps/ArchipelagoCampaign/LotV/ap_the_infinite_cycle.SC2Map/Triggers
@@ -1193,6 +1193,8 @@
         <FunctionCall Type="FunctionCall" Id="63E49AD3"/>
         <FunctionCall Type="FunctionCall" Id="D403E445"/>
         <FunctionCall Type="FunctionCall" Id="6BADDDA7"/>
+        <FunctionCall Type="Comment" Id="6D45D2C8"/>
+        <FunctionCall Type="FunctionCall" Id="2F3364EF"/>
     </Element>
     <Element Type="FunctionCall" Id="3D0340A7">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="00000133"/>
@@ -1285,6 +1287,21 @@
         <ParameterDef Type="ParamDef" Library="ABFE498B" Id="0BEEBA94"/>
         <Variable Type="Variable" Id="CB61C69D"/>
     </Element>
+    <Element Type="Comment" Id="6D45D2C8">
+        <Comment>
+            Vanilla Kerrigan moves at 2.95 (as with Psionic Shift)
+        </Comment>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+    </Element>
+    <Element Type="FunctionCall" Id="2F3364EF">
+        <FunctionDef Type="FunctionDef" Library="ABFE498B" Id="26B7EA53"/>
+        <SubFunctionType Type="SubFuncType" Library="Ntve" Id="00000004"/>
+        <Parameter Type="Param" Id="98737D28"/>
+    </Element>
+    <Element Type="Param" Id="98737D28">
+        <ParameterDef Type="ParamDef" Library="ABFE498B" Id="2F6B2A41"/>
+        <Variable Type="Variable" Id="CB61C69D"/>
+    </Element>
     <Element Type="FunctionCall" Id="7DDEB7F2">
         <FunctionDef Type="FunctionDef" Library="Ntve" Id="9F8EF8FB"/>
         <Parameter Type="Param" Id="ABB45877"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
index 4877bac73..630e981d8 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/PreloadAssetDB.txt
@@ -24284,11 +24284,11 @@ Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerra
 Effect=AP_ChainReaction2
 id=AP_ChainReaction2
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
-Effect=##id##Delay,AP_ChainReactionDamage2,AP_ChainReactionMarker,AP_K5InfestBroodlings
+Effect=##id##Delay,AP_ChainReaction2Damage,AP_ChainReactionMarker,AP_K5InfestBroodlings
 id=AP_ChainReaction2Delay
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 Effect=AP_ChainReactionSearchForNewTarget2
-id=AP_ChainReactionDamage2
+id=AP_ChainReaction2Damage
 Actor=AP_ChainReaction2Attack,AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
 id=AP_ChainReactionSearchForNewTarget2
 Actor=AP_GimbalZTurret,CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,TerrainMgr
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 670434347..90bcefc84 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -1908,7 +1908,7 @@ Button/Tooltip/AP_CarrierStructuralIntegrityReinforcements=Increases Carrier arm
 Button/Tooltip/AP_CausticSpray=Emits a stream of acid that deals <d ref="Effect,AP_CausticSprayLevel1_Damage,Amount/Effect,AP_CausticSprayLevel1_Persistent,PeriodicPeriodArray[0]" precision="1"/> damage per second for <d ref="Effect,AP_CausticSprayLevel1_Persistent,PeriodCount*Effect,AP_CausticSprayLevel1_Persistent,PeriodicPeriodArray[0]" precision="1"/> seconds, then increases to <d ref="Effect,AP_CausticSprayLevel2_Damage,Amount/Effect,AP_CausticSprayLevel2_Persistent,PeriodicPeriodArray[0]" precision="1"/> damage per second.<n/><n/><c val="ffff8a">Channeled ability.</c><c val="#ColorAttackInfo"> Can only target enemy structures.</c>
 Button/Tooltip/AP_CentrifugalHooksUpgrade=Increases Baneling movement speed.
 Button/Tooltip/AP_CerberusMines=Increases blast radius and trigger radius by 33%.
-Button/Tooltip/AP_ChainReaction=Kerrigan's attacks deal normal damage to her target then jump to additional nearby enemies. Deals <d ref="Effect,AP_ChainReactionDamage2,Amount"/> damage to up to four additional targets.
+Button/Tooltip/AP_ChainReaction=Kerrigan's attacks deal normal damage to her target then jump to additional nearby enemies. Deals <d ref="Effect,AP_ChainReaction2Damage,Amount"/> damage to up to four additional targets.
 Button/Tooltip/AP_Charge=Intercepts enemy ground units.
 Button/Tooltip/AP_ChitinousPlating=Increases Ultralisk armor by 2.
 Button/Tooltip/AP_CliffJumper=This unit can jump up and down cliffs.
@@ -3081,7 +3081,7 @@ Effect/Name/AP_ChainReaction4Delay=Chain Reaction4 Delay
 Effect/Name/AP_ChainReaction4SearchForNewTarget=Chain Reaction4 Search For New Target
 Effect/Name/AP_ChainReaction5=Chain Reaction5
 Effect/Name/AP_ChainReaction5Damage=Chain Reaction5 Damage
-Effect/Name/AP_ChainReactionDamage2=Chain Reaction2 Damage
+Effect/Name/AP_ChainReaction2Damage=Chain Reaction2 Damage
 Effect/Name/AP_ChainReactionMarker=Chain Reaction Marker
 Effect/Name/AP_ChainReactionSearchForNewTarget2=Chain Reaction2 Search For New Target
 Effect/Name/AP_Claws=Claws (Damage)