diff --git a/SC Evo Complete/SCEvo_Assets.SC2Mod/Base.SC2Assets/Assets/Buildings/Zerg/InfestedCommandCenterSCBW/InfestedCommandCenterSCBW.m3 b/SC Evo Complete/SCEvo_Assets.SC2Mod/Base.SC2Assets/Assets/Buildings/Zerg/InfestedCommandCenterSCBW/InfestedCommandCenterSCBW.m3
index 5bced15..87f6215 100644
Binary files a/SC Evo Complete/SCEvo_Assets.SC2Mod/Base.SC2Assets/Assets/Buildings/Zerg/InfestedCommandCenterSCBW/InfestedCommandCenterSCBW.m3 and b/SC Evo Complete/SCEvo_Assets.SC2Mod/Base.SC2Assets/Assets/Buildings/Zerg/InfestedCommandCenterSCBW/InfestedCommandCenterSCBW.m3 differ
diff --git a/SC Evo Complete/SCEvo_Core.SC2Mod/Base.SC2Data/GameData/SCBW/Terran_Units.xml b/SC Evo Complete/SCEvo_Core.SC2Mod/Base.SC2Data/GameData/SCBW/Terran_Units.xml
index f00a253..e1a5f90 100644
--- a/SC Evo Complete/SCEvo_Core.SC2Mod/Base.SC2Data/GameData/SCBW/Terran_Units.xml	
+++ b/SC Evo Complete/SCEvo_Core.SC2Mod/Base.SC2Data/GameData/SCBW/Terran_Units.xml	
@@ -1503,6 +1503,15 @@
         </ToDInfoArray>
         <EditorCategories value="LightGroup:PortraitsUnitsTerran"/>
     </CLight>
+    <CActorRange id="SpiderMineSCBW@Range" parent="RangeAbil" abil="MedicSCBWOpticFlare">
+        <On index="1" Terms="Abil.VulturePlaceSpiderMineSCBW.TargetOn" Send="Create"/>
+        <On index="2" Terms="Abil.VulturePlaceSpiderMineSCBW.TargetOff" Send="Destroy"/>
+        <On index="3" Terms="Abil.VulturePlaceSpiderMineSCBW.ButtonHoverOn" Send="Create"/>
+        <On index="4" Terms="Abil.VulturePlaceSpiderMineSCBW.ButtonHoverOff" Send="Destroy"/>
+        <Abil Link="VulturePlaceSpiderMineSCBW"/>
+        <Icon value="Assets\Textures\RadarIcon2.dds"/>
+        <IconArcLength value="3.250000"/>
+    </CActorRange>
     <CActorRange id="SiegeTankSCBW@Range" parent="RangeWeapon" abil="GhostSCBWLockdown">
         <Flags index="SuppressSaveLoad" value="1"/>
         <On Terms="SelectionLocalUpdate.SiegeTankSCBWSieged.Start" Send="Create"/>
diff --git a/SC Evo Complete/SCEvo_Core.SC2Mod/PreloadAssetDB.txt b/SC Evo Complete/SCEvo_Core.SC2Mod/PreloadAssetDB.txt
index 550a9d0..7d7738d 100644
--- a/SC Evo Complete/SCEvo_Core.SC2Mod/PreloadAssetDB.txt	
+++ b/SC Evo Complete/SCEvo_Core.SC2Mod/PreloadAssetDB.txt	
@@ -396,7 +396,7 @@ Effect=##id##@Healer
 id=VulturePlaceSpiderMineSCBW
 asset=Assets\Textures\WayPointLine.dds
 asset=Assets\UI\Cursors\WayPointAttack_Void\WayPointAttack_Void.m3
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,SpiderMineSCBW@Range,TerrainMgr
 Effect=##id##@Set
 Unit=SpiderMineSCBW
 id=BattlecruiserSCBWYamato
@@ -853,6 +853,8 @@ Sound=DroneSCBWWeapon@Impact
 id=DroneSCBWWeapon@Launch
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Sound
+id=PhotonCannonSCBW@PlacementModel
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,PhotonCannonSCBW@Range,TerrainMgr
 id=DropshipSCBW@UnloadDropAnim
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 id=OverlordSCBW@UnloadDropAnim
@@ -1883,6 +1885,10 @@ Actor=CliffLocalSelection,CliffLocalSelectionObserver,CliffPreSelection,CliffPre
 Model=##id##,##id##@Death,##id##@DeathRagdoll,##id##@Placement,##id##@Portrait,##id##@WarpIn,HallucinationDeath,Invisible,ProtossSmallUnitDeathLow,TerranSmallUnitDeathLow,WaterRippleMedium,ZergSmallUnitDeathLow
 PhysicsMaterial=Water
 Sound=##id##@Attack,##id##@Help,##id##@Pissed,##id##@Ready,##id##@What,##id##@Yes,##id##_Ambience,DarkTemplar_BlinkDummyVO,Protoss_BuildingPlacementSmall
+id=PhotonCannonSCBW@Range
+asset=Assets\Textures\RadarIcon2.dds
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
+Weapon=PhotonCannonSCBWWeapon
 id=StargateSCBW@Death
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,DeadAnimationMacro,InfestedCommandCenterSCBW,StargateSCBW,TerrainMgr,UnitSound
 Sound=NydusWorm_DeathThud,Protoss_ExplosionLarge,Protoss_ExplosionMedium,Protoss_ExplosionSmall,Protoss_PreExplosionSmall,Terran_ExplosionLarge,Terran_ExplosionMedium,Terran_ExplosionSmall,Terran_PreExplosionSmall,Zerg_ExplosionLarge,Zerg_ExplosionMedium,Zerg_ExplosionSlime,Zerg_ExplosionSmall,Zerg_ExplosionTiny,Zerg_PreExplosionSmall
@@ -1936,6 +1942,18 @@ Model
 id=PylonSCBW@Splat
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model
+id=SiegeTankSCBW@Range
+asset=Assets\Textures\RadarIcon2.dds
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
+Weapon=SiegeTankSCBWSiegedWeapon
+id=MedicSCBWRestoration@Range
+asset=Assets\Textures\RadarIcon2.dds
+Abil=MedicSCBWRestoration
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
+id=ScienceVesselSCBWEMPShockwave@Range
+asset=Assets\Textures\RadarIcon1.dds
+Abil=ScienceVesselSCBWEMPShockwave
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 id=ScienceVesselSCBWEMPShockwave@CursorSplat
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,CursorRegion,InfestedCommandCenterSCBW,TerrainMgr
 Model=TerranAOECursorSplat
@@ -2394,6 +2412,10 @@ Model
 id=BarracksSCBW@Splat
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model
+id=LurkerSCBW@Range
+asset=Assets\Textures\RadarIcon1.dds
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
+Weapon=LurkerSCBWWeapon
 id=QueenSCBWEnsnare@Glaze
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model
@@ -2556,28 +2578,10 @@ id=LairSCBW@MorphProgress
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr,ZergBuildingSCBW@MorphEnd,ZergBuildingSCBW@MorphStart
 id=HiveSCBW@MorphProgress
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr,ZergBuildingSCBW@MorphEnd,ZergBuildingSCBW@MorphStart
-id=MedicSCBWRestoration@Range
+id=SpiderMineSCBW@Range
 asset=Assets\Textures\RadarIcon2.dds
-Abil=MedicSCBWRestoration
+Abil=VulturePlaceSpiderMineSCBW
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-id=ScienceVesselSCBWEMPShockwave@Range
-asset=Assets\Textures\RadarIcon1.dds
-Abil=ScienceVesselSCBWEMPShockwave
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-id=SiegeTankSCBW@Range
-asset=Assets\Textures\RadarIcon2.dds
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-Weapon=SiegeTankSCBWSiegedWeapon
-id=LurkerSCBW@Range
-asset=Assets\Textures\RadarIcon1.dds
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-Weapon=LurkerSCBWWeapon
-id=PhotonCannonSCBW@Range
-asset=Assets\Textures\RadarIcon2.dds
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-Weapon=PhotonCannonSCBWWeapon
-id=PhotonCannonSCBW@PlacementModel
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,PhotonCannonSCBW@Range,TerrainMgr
 parent=GenericBurrowerStandardSCBW
 id=LurkerSCBW
 path=Assets\Textures\.dds
@@ -5378,18 +5382,24 @@ Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnes
 id=DroneSCBWWeapon@Impact
 asset=Assets\Effects\Zerg\DroneWeaponImpact\DroneWeaponImpact.m3
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
+id=PhotonCannonSCBW@Placement
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
+Model=PhotonCannon
+id=PhotonCannonSCBW
+asset=Assets\Buildings\Protoss\PhotonCannonEx2\PhotonCannonEx2.m3
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 id=ShieldBatterySCBWRecharge@Beam
 asset=Assets\Effects\Protoss\ProtossShield_Battery_Beam\ProtossShield_Battery_Beam.m3
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 id=ShieldBatterySCBWRecharge@Model
 asset=Assets\Effects\Protoss\ProtossShield_Battery_Beam_Impact\ProtossShield_Battery_Beam_Impact.m3
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-id=ShieldBatterySCBW
-asset=Assets\Buildings\Protoss\ProtossShield_Battery\ProtossShield_Battery.m3
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 id=ShieldBatterySCBW@Placement
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model=ShieldBattery
+id=ShieldBatterySCBW
+asset=Assets\Buildings\Protoss\ProtossShield_Battery\ProtossShield_Battery.m3
+Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 id=InfestedCommandCenterSCBW@Death
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model=##id##Low
@@ -6316,9 +6326,6 @@ Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnes
 id=ObserverSCBW@WarpIn
 asset=Assets\Units\Protoss\ObserverWarpIn\ObserverWarpIn.m3
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-id=PhotonCannonSCBW
-asset=Assets\Buildings\Protoss\PhotonCannonEx2\PhotonCannonEx2.m3
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 id=PhotonCannonSCBW@Death
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model=ProtossSmallBuildingDeathLow
@@ -6565,9 +6572,6 @@ Model=ProtossBuildingDeathLow
 id=ArbiterTribunalSCBW@Placement
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model=ArbiterTribunalSCBW
-id=PhotonCannonSCBW@Placement
-Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
-Model=PhotonCannon
 id=ObservatorySCBW@Splat
 asset=Assets\Splats\Splat_TemplarArchives\Splat_TemplarArchives.m3
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
@@ -7563,6 +7567,9 @@ Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnes
 id=HatcherySCBW@Placement
 Actor=CommandUIHarnessAttackProtoss,CommandUIHarnessAttackTerran,CommandUIHarnessAttackZerg,CommandUIHarnessConfirmProtoss,CommandUIHarnessConfirmTerran,CommandUIHarnessConfirmZerg,CommandUIHarnessMoveProtoss,CommandUIHarnessMoveTerran,CommandUIHarnessMoveZerg,CommandUIHarnessRallyProtoss,CommandUIHarnessRallyTerran,CommandUIHarnessRallyZerg,InfestedCommandCenterSCBW,TerrainMgr
 Model=HatcherySCBW
+parent=PhotonCannonSCBW
+id=PhotonCannonSCBW@Birth
+asset=Assets\Buildings\Protoss\PhotonCannonWarpIn\PhotonCannonWarpIn.m3
 parent=ProtossAdvisorSCBW@PortraitBase
 id=ProtAdvisorSCBW@Portrait
 asset=Assets\Portraits\Protoss\Aldaris@PortraitSCBW\Aldaris@PortraitSCBW.m3
@@ -7590,9 +7597,6 @@ id=ArbiterTribunalSCBW@Portrait
 asset=Assets\Portraits\Protoss\Aldaris@PortraitSCBW\Aldaris@PortraitSCBW.m3
 id=ShieldBatterySCBW@Portrait
 asset=Assets\Portraits\Protoss\Aldaris@PortraitSCBW\Aldaris@PortraitSCBW.m3
-parent=PhotonCannonSCBW
-id=PhotonCannonSCBW@Birth
-asset=Assets\Buildings\Protoss\PhotonCannonWarpIn\PhotonCannonWarpIn.m3
 parent=ForgeSCBW
 id=ForgeSCBW@Birth
 asset=Assets\Buildings\Protoss\ForgeWarpIn\ForgeWarpIn.m3
diff --git a/SC Evo Complete/SCEvo_Core.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt b/SC Evo Complete/SCEvo_Core.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt
index 73c203c..ad61318 100644
--- a/SC Evo Complete/SCEvo_Core.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt	
+++ b/SC Evo Complete/SCEvo_Core.SC2Mod/enUS.SC2Data/LocalizedData/ObjectStrings.txt	
@@ -623,6 +623,7 @@ Actor/Name/SpiderMineSCBW=Spider Mine
 Actor/Name/SpiderMineSCBW@BurrowSound=Burrow Sound
 Actor/Name/SpiderMineSCBW@BurySound=Bury Sound
 Actor/Name/SpiderMineSCBW@PlaceSound=Place Sound
+Actor/Name/SpiderMineSCBW@Range=Range
 Actor/Name/SpiderMineSCBW@SeekSound=Seek Sound
 Actor/Name/SpiderMineSCBW@UnburrowRange=Unburrow Range
 Actor/Name/SpiderMineSCBWWeapon@Action=Action