diff --git a/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml b/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
index bcde82f..cc37f12 100644
--- a/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
+++ b/1.6/1.6/Defs/AbilityDefs/ARA_Abilities.xml
@@ -1600,7 +1600,7 @@
     <comps>
       <li Class="ArachnaeSwarm.CompProperties_AbilityLaunchMultiProjectile">
         <projectileDef>Bullet_ARA_RW_Basic_Fist_Needle_Gun</projectileDef>
-        <numProjectiles>12</numProjectiles>
+        <numProjectiles>1</numProjectiles>
       </li>
     </comps>
   </AbilityDef>
diff --git a/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml b/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
index c9c8487..5ad130c 100644
--- a/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
+++ b/1.6/1.6/Defs/PawnKindDef/ARA_PawnKinds.xml
@@ -530,30 +530,6 @@
 			</li>
 		</lifeStages>
 	</PawnKindDef>
-	<PawnKindDef ParentName="ARA_InsectKindBase">
-		<defName>ArachnaeBase_Race_Baneling</defName>
-		<label>阿拉克涅爆裂种</label>
-		<race>ArachnaeBase_Race_Baneling</race>
-		<lifeStages>
-			<li>
-				<bodyGraphicData>
-					<texPath>ArachnaeSwarm/Things/ARA_Baneling/Bodies/Naked_Thin</texPath>
-					<drawSize>1</drawSize>
-					<shadowData>
-						<volume>(0.4, 0.5, 0.37)</volume>
-						<offset>(0,0,-0.15)</offset>
-					</shadowData>
-				</bodyGraphicData>
-				<dessicatedBodyGraphicData>
-					<texPath>Things/Pawn/Animal/Spelopede/Dessicated_Spelopede</texPath>
-					<drawSize>1</drawSize>
-				</dessicatedBodyGraphicData>
-			</li>
-		</lifeStages>
-    <abilities>
-      <li>ARA_Baneling_Suicide_Ability</li>
-    </abilities>
-	</PawnKindDef>
 	<PawnKindDef ParentName="ARA_InsectKindBase">
 		<defName>ArachnaeBase_Race_Skyhive</defName>
 		<label>阿拉克涅天巢种</label>
@@ -626,6 +602,9 @@
 				</dessicatedBodyGraphicData>
 			</li>
 		</lifeStages>
+    <abilities>
+      <li>ARA_Baneling_Suicide_Ability</li>
+    </abilities>
 	</PawnKindDef>
 	<PawnKindDef ParentName="ARA_InsectKindBase">
 		<defName>ArachnaeBase_Race_Empsuicider</defName>
diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDroneSwarm.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDroneSwarm.xml
deleted file mode 100644
index 18cf944..0000000
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceDroneSwarm.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-  <ThingDef ParentName="AnimalThingBase" Name="ARA_BaseDroneSwarm" Abstract="True">
-    <statBases>
-      <MarketValue>0</MarketValue>
-      <PsychicSensitivity>1</PsychicSensitivity>
-      <ToxicResistance>1</ToxicResistance>
-      <Flammability>1</Flammability>
-      <ComfyTemperatureMin>-100</ComfyTemperatureMin>
-      <ComfyTemperatureMax>250</ComfyTemperatureMax>
-      <LeatherAmount>0</LeatherAmount>
-      <MeatAmount>0</MeatAmount>
-      <ToxicEnvironmentResistance>1</ToxicEnvironmentResistance>
-      <VacuumResistance>0</VacuumResistance>
-    </statBases>
-    <receivesSignals>true</receivesSignals>
-    <tradeability>None</tradeability>
-    <race>
-      <baseHealthScale>0.5</baseHealthScale>
-      <alwaysAwake>true</alwaysAwake>
-      <fleshType>Insectoid</fleshType>
-      <needsRest>false</needsRest>
-      <hasGenders>false</hasGenders>
-      <hasCorpse>false</hasCorpse>
-      <foodType>None</foodType>
-      <bloodDef>Filth_BloodInsect</bloodDef>
-      <lifeExpectancy>1</lifeExpectancy>
-      <disableIgniteVerb>true</disableIgniteVerb>
-      <trainability>None</trainability>
-      <soundCallIntervalRange>1000~2000</soundCallIntervalRange>
-      <soundCallIntervalFriendlyFactor>2</soundCallIntervalFriendlyFactor>
-      <thinkTreeConstant>SentryDroneConstant</thinkTreeConstant>
-      <hideTrainingTab>true</hideTrainingTab>
-      <intelligence>ToolUser</intelligence>
-      <thinkTreeMain>Drone</thinkTreeMain>
-      <canFlyInVacuum>true</canFlyInVacuum>
-      <lifeStageAges>
-        <li>
-          <def>EusocialInsectAdult</def>
-          <minAge>0</minAge>
-          <soundWounded>Pawn_Spelopede_Pain</soundWounded>
-          <soundDeath>Pawn_Spelopede_Death</soundDeath>
-          <soundCall>Pawn_Spelopede_Call</soundCall>
-          <soundAngry>Pawn_Spelopede_Angry</soundAngry>
-        </li>
-      </lifeStageAges>
-      <deathAction Class="DeathActionProperties_Vanish">
-        <workerClass>DeathActionWorker_Vanish</workerClass>
-        <filth>Filth_Slime</filth>
-        <filthCountRange>1~3</filthCountRange>
-      </deathAction>
-    </race>
-    <tools Inherit="False">
-      <li>
-        <label>巨颚</label>
-        <capacities>
-          <li>ARA_Bite</li>
-        </capacities>
-        <power>6</power>
-        <cooldownTime>2.6</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-      </li>
-    </tools>
-    <killedLeavings>
-    </killedLeavings>
-    <comps>
-      <li Class="CompProperties_MechPowerCell">
-        <totalPowerTicks>3400</totalPowerTicks>                <!-- 2 hours -->
-        <labelOverride>寿命</labelOverride>
-        <tooltipOverride>这种特殊的阿拉克涅辅虫从出生起就走在死亡的道路上了——它们的寿命就是如此短暂。</tooltipOverride>
-        <showGizmoOnNonPlayerControlled>true</showGizmoOnNonPlayerControlled>
-      </li>
-    </comps>
-  </ThingDef>
-  <ThingDef ParentName="ARA_BaseDroneSwarm">
-    <defName>ArachnaeBase_Race_Baneling</defName>
-    <label>阿拉克涅爆裂种</label>
-    <description>阿拉克涅辅虫之一，智力低下，一般以自杀式袭击的方式伤害敌军，靠近敌人后就会引爆酸囊产生危险的酸性雾气。</description>
-    <race>
-      <thinkTreeConstant>HunterDroneConstant</thinkTreeConstant>
-      <baseBodySize>0.25</baseBodySize>
-      <!-- <hasCorpse>false</hasCorpse> -->
-      <body>BeetleLikeWithClaw</body>
-      <baseHealthScale>1</baseHealthScale>
-    </race>
-    <statBases>
-      <MoveSpeed>6</MoveSpeed>
-    </statBases>
-    <comps>
-      <li Class="ArachnaeSwarm.CompProperties_HunterExplosion">
-        <explosionRadius>3.9</explosionRadius> <!-- Mapped from smokeRadius -->
-        <explosionDamageType>ARA_AcidBurn</explosionDamageType>
-        <explosionDamageAmount>40</explosionDamageAmount>
-        <armorPenetration>0.5</armorPenetration>
-        <explosionSound>Explosion_Smoke</explosionSound>
-        <postExplosionSpawnThingDef>ARA_AcidGasCloud</postExplosionSpawnThingDef>
-        <postExplosionSpawnChance>1</postExplosionSpawnChance>
-        <postExplosionSpawnThingCount>1</postExplosionSpawnThingCount>
-      </li>
-    </comps>
-    <tools Inherit="False">
-      <li>
-        <label>酸性巨颚</label>
-        <capacities>
-          <li>ARA_AcidCut</li>
-        </capacities>
-        <power>6</power>
-        <cooldownTime>2.6</cooldownTime>
-        <linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-        <ensureLinkedBodyPartsGroupAlwaysUsable>true</ensureLinkedBodyPartsGroupAlwaysUsable>
-      </li>
-    </tools>
-  </ThingDef>
-
-</Defs>
\ No newline at end of file
diff --git a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
index a54e4b7..3060580 100644
--- a/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
+++ b/1.6/1.6/Defs/ThingDef_Races/ARA_RaceNodeSwarm.xml
@@ -1931,6 +1931,11 @@
     </race>
 
     <comps>
+      <li Class="ArachnaeSwarm.CompProperties_AutoMechCarrier">
+        <freeProduction>true</freeProduction>
+        <disableHediff>ARA_RaceBaseSwarmProduceSwitchHediff</disableHediff>
+        <spawnEffecter>CocoonDestroyed</spawnEffecter>
+      </li>
       <li Class="ArachnaeSwarm.CompProperties_NodeSwarmLifetime">
         <immuteHediff>ARA_Cycle_Suppression_Hediff</immuteHediff>
         <lifespanHediff>ARA_LifespanHediff</lifespanHediff>
diff --git a/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml b/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
index d66ff48..a8133aa 100644
--- a/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
+++ b/1.6/1.6/Defs/ThinkTreeDefs/ARA_ThinkTrees.xml
@@ -2912,7 +2912,7 @@
                 <li Class="JobGiver_AIAbilityFight">
                   <targetAcquireRadius>65</targetAcquireRadius>
                   <targetKeepRadius>72</targetKeepRadius>
-                  <skipIfCantTargetNow>true</skipIfCantTargetNow>
+                  <skipIfCantTargetNow>false</skipIfCantTargetNow>
                   <ability>ARA_Locust_Needle_Fire</ability>
                   <allowTurrets>true</allowTurrets>
                   <needLOSToAcquireNonPawnTargets>true</needLOSToAcquireNonPawnTargets>
@@ -2950,7 +2950,7 @@
                 <li Class="JobGiver_AIAbilityFight">
                   <targetAcquireRadius>65</targetAcquireRadius>
                   <targetKeepRadius>72</targetKeepRadius>
-                  <skipIfCantTargetNow>true</skipIfCantTargetNow>
+                  <skipIfCantTargetNow>false</skipIfCantTargetNow>
                   <ability>ARA_Locust_Needle_Fire</ability>
                   <allowTurrets>true</allowTurrets>
                   <needLOSToAcquireNonPawnTargets>true</needLOSToAcquireNonPawnTargets>