diff --git a/1.6/Core/Defs/AbilityDef/AbilityDefs_Base.xml b/1.6/Core/Defs/AbilityDef/AbilityDefs_Base.xml
index 1ba84cb..4e783cc 100644
--- a/1.6/Core/Defs/AbilityDef/AbilityDefs_Base.xml
+++ b/1.6/Core/Defs/AbilityDef/AbilityDefs_Base.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
+  <!--==================================== 쿨타임 설정====================================-->
+
   <AbilityGroupDef>
     <defName>PNModule_2day</defName>
     <cooldownTicks>120000</cooldownTicks>
@@ -25,10 +27,112 @@
     <defName>PNModule_3hour</defName>
     <cooldownTicks>7500</cooldownTicks>
   </AbilityGroupDef>
-
   <AbilityGroupDef>
     <defName>PNModule_rightoff</defName>
     <cooldownTicks>120</cooldownTicks>
   </AbilityGroupDef>
 
+  <HediffDef Name="PN_ApparelIndustrialModuleHediffBase" Abstract="True">
+    <hediffClass>HediffWithComps</hediffClass>
+    <comps>
+      <li Class="HediffCompProperties_RemoveIfApparelDropped" />
+      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
+        <triggeredHediff>
+          <li>PN_ModuleUnstable_Industrial</li>
+        </triggeredHediff>
+      </li>
+    </comps>
+    <isBad>false</isBad>
+  </HediffDef>
+
+  <HediffDef Name="PN_ApparelSpacerModuleHediffBase" Abstract="True">
+    <hediffClass>HediffWithComps</hediffClass>
+    <comps>
+      <li Class="HediffCompProperties_RemoveIfApparelDropped" />
+      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
+        <triggeredHediff>
+          <li>PN_ModuleUnstable_Spacer</li>
+        </triggeredHediff>
+      </li>
+    </comps>
+    <isBad>false</isBad>
+  </HediffDef>
+
+  <!--<HediffDef ParentName="PN_ApparelModuleHediffBase">
+    <defName></defName>
+    <label></label>
+    <description></description>
+    <stages>
+
+    </stages>
+    <comps>
+      <li Class="HediffCompProperties_GiveAbility">
+        <abilityDef></abilityDef>
+      </li>
+    </comps>
+  </HediffDef>-->
+
+  <!--불안정-->
+
+  <HediffDef>
+    <defName>PN_ModuleUnstable_Industrial</defName>
+    <label>module system (unstable)</label>
+    <labelNoun>module system (unstable)</labelNoun>
+    <description>The module system is unstable. The module cannot be mounted until the system is stable.</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <comps>
+      <li Class="HediffCompProperties_Disappears">
+        <disappearsAfterTicks>20000</disappearsAfterTicks>
+        <showRemainingTime>True</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath"/>
+      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffNullifier">
+        <hediffToNullify>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_OfficerCommand</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_MeisterAdvice</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_IntensiveMedical</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_FieldMedic</li>
+
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_RapidFire</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_CQC</li>
+        </hediffToNullify>
+        <showMessage>false</showMessage>
+      </li>
+    </comps>
+    <stages>
+
+    </stages>
+  </HediffDef>
+  <HediffDef>
+    <defName>PN_ModuleUnstable_Spacer</defName>
+    <label>module system (unstable)</label>
+    <labelNoun>module system (unstable)</labelNoun>
+    <description>The module system is unstable. The module cannot be mounted until the system is stable.</description>
+    <hediffClass>HediffWithComps</hediffClass>
+    <isBad>false</isBad>
+    <comps>
+      <li Class="HediffCompProperties_Disappears">
+        <disappearsAfterTicks>120000</disappearsAfterTicks>
+        <showRemainingTime>True</showRemainingTime>
+      </li>
+      <li Class="HediffCompProperties_DisappearsOnDeath"/>
+      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffNullifier">
+        <hediffToNullify>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_OfficerCommand</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_MeisterAdvice</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_IntensiveMedical</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_FieldMedic</li>
+
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_RapidFire</li>
+          <li MayRequire="Ludeon.RimWorld.Ideology">PN_CQC</li>
+        </hediffToNullify>
+        <showMessage>false</showMessage>
+      </li>
+    </comps>
+    <stages>
+
+    </stages>
+  </HediffDef>
+
 </Defs>
\ No newline at end of file
diff --git a/1.6/Core/Defs/AutomataRace/AutomataWearSetting.xml b/1.6/Core/Defs/AutomataRace/AutomataWearSetting.xml
index c5c49bb..bdbf676 100644
--- a/1.6/Core/Defs/AutomataRace/AutomataWearSetting.xml
+++ b/1.6/Core/Defs/AutomataRace/AutomataWearSetting.xml
@@ -343,4 +343,4 @@
 
     </wearSetting>
   </AutomataRace.WearSetting.WearSettingDef>
-</Defs>
\ No newline at end of file
+</Defs>
diff --git a/1.6/Core/Defs/Drugs/Drugs_Antibiotics.xml b/1.6/Core/Defs/Drugs/Drugs_Antibiotics.xml
index 8d8168b..1af2a06 100644
--- a/1.6/Core/Defs/Drugs/Drugs_Antibiotics.xml
+++ b/1.6/Core/Defs/Drugs/Drugs_Antibiotics.xml
@@ -78,6 +78,9 @@
     <comps>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
         <hediffAndBodypart>
+          <li>
+            <hediff>PN_ateFuel</hediff>
+          </li>
           <li>
             <hediff>PN_AB_EffectBridge</hediff>
           </li>
@@ -212,32 +215,4 @@
       </li>
     </stages>
   </HediffDef>
-
-  <HediffDef>
-    <defName>PN_Antibiotics_High</defName>
-    <label>high-Antibiotics</label>
-    <description>A high-dose of antibiotics is active.</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <defaultLabelColor>(0.6, 0.8, 0.7)</defaultLabelColor>
-    <isBad>false</isBad>
-    <comps>
-      <li Class="HediffCompProperties_SeverityPerDay">
-        <severityPerDay>-1.0</severityPerDay>
-      </li>
-      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffExclusive">
-        <hediffToNullify>
-          <!-- <li>PN_Overclocking</li> -->
-          <!-- <li>PN_Overclocking_High</li> -->
-        </hediffToNullify>
-        <bodyDefBlackList>
-          <li>PNBody</li>
-        </bodyDefBlackList>
-      </li>
-    </comps>
-    <stages>
-      <li>
-        <becomeVisible>true</becomeVisible>
-      </li>
-    </stages>
-  </HediffDef>
-</Defs>
+</Defs>
\ No newline at end of file
diff --git a/1.6/Core/Defs/Drugs/Drugs_Fuel.xml b/1.6/Core/Defs/Drugs/Drugs_Fuel.xml
index 3411d54..6bdd469 100644
--- a/1.6/Core/Defs/Drugs/Drugs_Fuel.xml
+++ b/1.6/Core/Defs/Drugs/Drugs_Fuel.xml
@@ -43,11 +43,11 @@
       <useEatingSpeedStat>false</useEatingSpeedStat>
       <chairSearchRadius>25</chairSearchRadius>
       <outcomeDoers>
-        <!-- <li Class="IngestionOutcomeDoer_GiveHediff">
+        <li Class="IngestionOutcomeDoer_GiveHediff">
           <hediffDef>PN_ateFuel</hediffDef>
           <severity>1</severity>
           <doToGeneratedPawnIfAddicted>true</doToGeneratedPawnIfAddicted>
-        </li> -->
+        </li>
         <li Class="IngestionOutcomeDoer_GiveHediff">
           <hediffDef>PN_deletFuel</hediffDef>
           <severity>1</severity>
@@ -99,6 +99,36 @@
 
   <!--==================================== 오토마톤 연료 효과 ====================================-->
 
+  <HediffDef>
+    <defName>PN_ateFuel</defName>
+    <hediffClass>HediffWithComps</hediffClass>
+    <label>Ate automaton fuel</label>
+    <labelNoun>Ate Automaton Fuel</labelNoun>
+    <description>...</description>
+    <defaultLabelColor>(1,0,0.5)</defaultLabelColor>
+    <scenarioCanAdd>false</scenarioCanAdd>
+    <maxSeverity>1.0</maxSeverity>
+    <isBad>false</isBad>
+    <comps>
+      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
+        <hediffAndBodypart>
+          <li>
+            <hediff>PsychiteAddiction</hediff>
+          </li>
+          <li>
+            <hediff>FoodPoisoning</hediff>
+          </li>
+          <li>
+            <hediff>PN_deletFuel</hediff>
+          </li>
+        </hediffAndBodypart>
+        <bodyDefBlackList>
+          <li>PNBody</li>
+        </bodyDefBlackList>
+        <debug>false</debug>
+      </li>
+    </comps>
+  </HediffDef>
 
   <HediffDef>
     <defName>PN_deletFuel</defName>
@@ -111,7 +141,6 @@
     <maxSeverity>1.0</maxSeverity>
     <isBad>false</isBad>
     <comps>
-      <li Class="HediffCompProperties_DisappearsOnDeath"/>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffExclusive">
         <hediffToNullify>
           <li>PN_AutomatonFuel_Addiction</li>
@@ -138,29 +167,16 @@
     <label>Automaton Fuel</label>
     <description>A condition that requires PnL fuel.</description>
     <defaultLabelColor>(222,90,90)</defaultLabelColor>
+    <causesNeed>PN_Need_Fuel</causesNeed>
     <scenarioCanAdd>false</scenarioCanAdd>
     <everCurableByItem>false</everCurableByItem>
     <isBad>false</isBad>
     <comps>
-      <li Class="HediffCompProperties_SeverityPerDay">
-        <severityPerDay>-1.0</severityPerDay>
-      </li>
-      <!-- <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffExclusive">
-        <hediffToNullify>
-          <li>PN_Overclocking</li>
-          <li>PN_Overclocking_High</li>
-        </hediffToNullify>
-        <bodyDefBlackList>
-          <li>PNBody</li>
-        </bodyDefBlackList>
-      </li> -->
+
     </comps>
     <stages>
       <li>
         <label>stable</label>
-        <enablesNeeds>
-          <li>PN_Need_Fuel</li>
-        </enablesNeeds>
       </li>
       <li>
         <label>required</label>
@@ -183,10 +199,7 @@
           </li>
         </capMods>
         <hungerRateFactor>8.0</hungerRateFactor>
-        <enablesNeeds>
-          <li>PN_Need_Fuel</li>
-        </enablesNeeds>
       </li>
     </stages>
   </HediffDef>
-</Defs>
+</Defs>
\ No newline at end of file
diff --git a/1.6/Core/Defs/HediffDefs/Hediffs_Abilities.xml b/1.6/Core/Defs/HediffDefs/Hediffs_Abilities.xml
deleted file mode 100644
index f31c1aa..0000000
--- a/1.6/Core/Defs/HediffDefs/Hediffs_Abilities.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<Defs>
-
-  <HediffDef Name="PN_ApparelIndustrialModuleHediffBase" Abstract="True">
-    <hediffClass>HediffWithComps</hediffClass>
-    <comps>
-      <li Class="HediffCompProperties_RemoveIfApparelDropped" />
-      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
-        <triggeredHediff>
-          <li>PN_ModuleUnstable_Industrial</li>
-        </triggeredHediff>
-      </li>
-    </comps>
-    <isBad>false</isBad>
-  </HediffDef>
-
-  <HediffDef Name="PN_ApparelSpacerModuleHediffBase" Abstract="True">
-    <hediffClass>HediffWithComps</hediffClass>
-    <comps>
-      <li Class="HediffCompProperties_RemoveIfApparelDropped" />
-      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
-        <triggeredHediff>
-          <li>PN_ModuleUnstable_Spacer</li>
-        </triggeredHediff>
-      </li>
-    </comps>
-    <isBad>false</isBad>
-  </HediffDef>
-  
-  <HediffDef Name="PN_AbilityHediffBase" Abstract="True">
-		<hediffClass>HediffWithComps</hediffClass>
-		<isBad>false</isBad>
-  </HediffDef>
-
-  <HediffDef>
-    <defName>PN_ModuleUnstable_Industrial</defName>
-    <label>module system (unstable)</label>
-    <labelNoun>module system (unstable)</labelNoun>
-    <description>The module system is unstable. The module cannot be mounted until the system is stable.</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <isBad>false</isBad>
-    <comps>
-      <li Class="HediffCompProperties_Disappears">
-        <disappearsAfterTicks>20000</disappearsAfterTicks>
-        <showRemainingTime>True</showRemainingTime>
-      </li>
-      <li Class="HediffCompProperties_DisappearsOnDeath"/>
-      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffNullifier">
-        <hediffToNullify>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_OfficerCommand</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_MeisterAdvice</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_IntensiveMedical</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_FieldMedic</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_RapidFire</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_CQC</li>
-        </hediffToNullify>
-        <showMessage>false</showMessage>
-      </li>
-    </comps>
-  </HediffDef>
-  
-  <HediffDef>
-    <defName>PN_ModuleUnstable_Spacer</defName>
-    <label>module system (unstable)</label>
-    <labelNoun>module system (unstable)</labelNoun>
-    <description>The module system is unstable. The module cannot be mounted until the system is stable.</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <isBad>false</isBad>
-    <comps>
-      <li Class="HediffCompProperties_Disappears">
-        <disappearsAfterTicks>120000</disappearsAfterTicks>
-        <showRemainingTime>True</showRemainingTime>
-      </li>
-      <li Class="HediffCompProperties_DisappearsOnDeath"/>
-      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffNullifier">
-        <hediffToNullify>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_OfficerCommand</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_MeisterAdvice</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_IntensiveMedical</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_FieldMedic</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_RapidFire</li>
-          <li MayRequire="Ludeon.RimWorld.Ideology">PN_CQC</li>
-        </hediffToNullify>
-        <showMessage>false</showMessage>
-      </li>
-    </comps>
-  </HediffDef>
-
-</Defs> 
\ No newline at end of file
diff --git a/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml b/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml
index 66b710f..f21c5ff 100644
--- a/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml
+++ b/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonBase.xml
@@ -60,7 +60,8 @@
   </HediffDef>
 
   <!--==================================== 오토마톤 기본 ====================================-->
-  <HediffDef Name="PanielBaseHediff_Abstract" Abstract="True">
+  <HediffDef>
+    <defName>PanielBaseHediff</defName>
     <hediffClass>HediffWithComps</hediffClass>
     <label>Automaton base</label>
     <description>This pawn is Automaton.</description>
@@ -70,6 +71,13 @@
     <initialSeverity>1</initialSeverity>
     <isBad>false</isBad>
     <countsAsAddedPartOrImplant>true</countsAsAddedPartOrImplant>
+    <disablesNeeds>
+      <li>Outdoors</li>
+      <li>DrugDesire</li>
+      <li>RoomSize</li>
+      <li>Comfort</li>
+      <li MayRequire="Dubwise.DubsBadHygiene">Bladder</li>
+    </disablesNeeds>
     <stages>
       <li>
         <becomeVisible>false</becomeVisible>
@@ -84,7 +92,6 @@
       </li>
     </stages>
     <comps>
-      <li Class="HediffCompProperties_DisappearsOnDeath"/>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffNullifier">
         <hediffToNullify>
           <li>Carcinoma</li>
@@ -111,18 +118,9 @@
           <li MayRequire="Ludeon.RimWorld.Biotech">PregnantHuman</li>
         </hediffToNullify>
         <showMessage>true</showMessage>
+        <nullifyKey>PN_HediffNullifier</nullifyKey>
       </li>
-      <!-- <li Class="HediffCompProperties_DisableNeed">
-        <needs>
-          <li>Food</li>
-          <li>Rest</li>
-        </needs>
-      </li> -->
     </comps>
-  </HediffDef>
-
-  <HediffDef ParentName="PanielBaseHediff_Abstract">
-    <defName>PanielBaseHediff</defName>
     <modExtensions>
       <li Class="AutomataRace.YourOwnRaceHediffGiver.HediffDefModExtension">
         <race>Paniel_Race</race>
@@ -298,4 +296,4 @@
       </li>
     </stages>
   </HediffDef>
-</Defs>
\ No newline at end of file
+</Defs>
diff --git a/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml b/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml
index 832f196..9b86a21 100644
--- a/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml
+++ b/1.6/Core/Defs/HediffDefs/Hediffs_AutomatonGrade_PA.xml
@@ -28,7 +28,6 @@
       </li>
     </stages>
     <comps>
-      <li Class="HediffCompProperties_DisappearsOnDeath"/>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
         <triggeredHediff>
           <li>PN_Ex_filterA</li>
@@ -321,12 +320,12 @@
     <label>Engineer model (legd)</label>
   </HediffDef>
 
-  <!--==================================== 가사형 ====================================-->
+  <!--==================================== 가정형 ====================================-->
 
   <!--평범-->
 
   <HediffDef ParentName="PN_Give_Base">
-    <label>PAfilter(PNgrade H norm)</label>
+    <label>PAfilter(PNgrade D norm)</label>
     <defName>PN_Give_Normal_Domestic_PA</defName>
     <comps>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
@@ -354,7 +353,7 @@
   <!--상급-->
 
   <HediffDef ParentName="PN_Give_Base">
-    <label>PAfilter(PNgrade H good)</label>
+    <label>PAfilter(PNgrade D good)</label>
     <defName>PN_Give_Good_Domestic_PA</defName>
     <comps>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
@@ -382,7 +381,7 @@
   <!--완벽-->
 
   <HediffDef ParentName="PN_Give_Base">
-    <label>PAfilter(PNgrade H exc)</label>
+    <label>PAfilter(PNgrade D exc)</label>
     <defName>PN_Give_Excellent_Domestic_PA</defName>
     <comps>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
@@ -410,7 +409,7 @@
   <!--걸작-->
 
   <HediffDef ParentName="PN_Give_Base">
-    <label>PAfilter(PNgrade H mast)</label>
+    <label>PAfilter(PNgrade D mast)</label>
     <defName>PN_Give_Masterwork_Domestic_PA</defName>
     <comps>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
@@ -438,7 +437,7 @@
   <!--전설-->
 
   <HediffDef ParentName="PN_Give_Base">
-    <label>PAfilter(PNgrade H legd)</label>
+    <label>PAfilter(PNgrade D legd)</label>
     <defName>PN_Give_Legendary_Domestic_PA</defName>
     <comps>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
@@ -463,25 +462,29 @@
     <label>Domestic model (legd)</label>
   </HediffDef>
 
-  <!--==================================== 실험체 ====================================-->
+  <!--==================================== 기타 ====================================-->
+
+  <!--실험체-->
 
   <HediffDef ParentName="PN_Give_Base">
+    <label>filter(PNgrade test)</label>
     <defName>PN_Give_Testsubject</defName>
-    <label>Test subject</label>
     <comps>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_MultipleHediff">
         <bodyDef>PNBody</bodyDef>
         <hediffAndBodypart>
           <li>
-            <hediff>PN_Learning_Limit_System</hediff>
+            <hediff>PN_SyncGood_Testsubject</hediff>
+          </li>
+          <li>
+            <hediff>PN_PnLAuthenticated</hediff>
           </li>
         </hediffAndBodypart>
       </li>
-      <li Class="AutomataRace.MoharHediffs.HeDiffCompProperties_HediffExclusive">
+      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffExclusive">
         <hediffToApply>PN_SyncGood_Testsubject</hediffToApply>
         <hediffToNullify>
-          <li>PN_SyncAwful_Failure</li>
-          <li>PN_SyncPoor_Failure</li>
+          <li>PN_Learning_Limit_System</li>
         </hediffToNullify>
         <bodyDef>PNBody</bodyDef>
       </li>
@@ -490,7 +493,34 @@
 
   <HediffDef ParentName="PN_SyncGood_Base">
     <defName>PN_SyncGood_Testsubject</defName>
-    <label>Test subject(good)</label>
+    <label>Test model (good)</label>
+    <stages Inherit="false">
+      <li>
+        <capMods>
+          <li>
+            <capacity>Consciousness</capacity>
+            <offset>0.05</offset>
+          </li>
+          <li>
+            <capacity>Moving</capacity>
+            <offset>0.10</offset>
+          </li>
+          <li>
+            <capacity>Sight</capacity>
+            <offset>0.10</offset>
+          </li>
+          <li>
+            <capacity>Manipulation</capacity>
+            <offset>0.10</offset>
+          </li>
+        </capMods>
+        <statOffsets>
+          <PsychicSensitivity>1.0</PsychicSensitivity>
+          <ResearchSpeed>0.9</ResearchSpeed>
+          <GlobalLearningFactor>1.50</GlobalLearningFactor>
+          <MentalBreakThreshold>0.12</MentalBreakThreshold>
+        </statOffsets>
+      </li>
+    </stages>
   </HediffDef>
-
 </Defs>
\ No newline at end of file
diff --git a/1.6/Core/Defs/HediffDefs/Hediffs_Maintenance.xml b/1.6/Core/Defs/HediffDefs/Hediffs_Maintenance.xml
index 1cdb762..7044c1e 100644
--- a/1.6/Core/Defs/HediffDefs/Hediffs_Maintenance.xml
+++ b/1.6/Core/Defs/HediffDefs/Hediffs_Maintenance.xml
@@ -2,6 +2,7 @@
 <Defs>
   <HediffDef>
     <defName>PN_Maintenance</defName>
+    <hediffClass>AutomataRace.Hediff_Maintenance</hediffClass>
     <label>Maintenance</label>    <!--정비상태-->
     <defaultLabelColor>(0.8, 0.8, 0.8)</defaultLabelColor>
     <description>The maintenance status of the automaton.\nIf it is low, it will cause malfunction.\n\nMaintenance is required every year (60 rimworld days).</description>
@@ -11,6 +12,7 @@
       <RecipeDef>PN_Maintenance</RecipeDef>
       <RecipeDef>PN_Repair</RecipeDef>
     </descriptionHyperlinks>
+    <causesNeed>PN_Need_Maintenance</causesNeed>
     <scenarioCanAdd>false</scenarioCanAdd>
     <countsAsAddedPartOrImplant>true</countsAsAddedPartOrImplant>
     <isBad>false</isBad>
@@ -44,9 +46,6 @@
           <WorkSpeedGlobal>-0.20</WorkSpeedGlobal>
           <MoveSpeed>-0.8</MoveSpeed>
         </statOffsets>
-        <enablesNeeds>
-          <li>PN_Need_Maintenance</li>
-        </enablesNeeds>
       </li>
       <li>
         <label>required</label>
@@ -76,9 +75,6 @@
           <WorkSpeedGlobal>-0.10</WorkSpeedGlobal>
           <MoveSpeed>-0.4</MoveSpeed>
         </statOffsets>
-        <enablesNeeds>
-          <li>PN_Need_Maintenance</li>
-        </enablesNeeds>
       </li>
       <li>
         <label>stable</label>
@@ -95,9 +91,6 @@
           <WorkSpeedGlobal>0.0</WorkSpeedGlobal>
           <MoveSpeed>0.0</MoveSpeed>-->
         </statOffsets>
-        <enablesNeeds>
-          <li>PN_Need_Maintenance</li>
-        </enablesNeeds>
       </li>
       <li>
         <label>flawless</label>
@@ -111,16 +104,13 @@
           <WorkSpeedGlobal>0.10</WorkSpeedGlobal>
           <MoveSpeed>0.2</MoveSpeed>
         </statOffsets>
-        <enablesNeeds>
-          <li>PN_Need_Maintenance</li>
-        </enablesNeeds>
       </li>
     </stages>
     <modExtensions>
-      <li Class="AutomataRace.YourOwnRaceHediffGiver.HediffDefModExtension">
-        <race>Paniel_Race</race>
-      </li>
-    </modExtensions>
+			<li Class="AutomataRace.YourOwnRaceHediffGiver.HediffDefModExtension">
+				<race>Paniel_Race</race>
+			</li>
+		</modExtensions>
   </HediffDef>
 
   <ThoughtDef>
diff --git a/1.6/Core/Defs/Scenarios/Scenarios.xml b/1.6/Core/Defs/Scenarios/Scenarios.xml
index 92639f0..148b57c 100644
--- a/1.6/Core/Defs/Scenarios/Scenarios.xml
+++ b/1.6/Core/Defs/Scenarios/Scenarios.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
-  <ScenarioDef ParentName="ScenarioBase">
+  <ScenarioDef>
     <defName>Paniel_Scenarios</defName>
     <label>Initial Testing Program: Automaton</label>
     <description>PnL Industry has launched their newest product with superior intelligence capability. They scheduled initial testing program to measure its survivability under extreme(or harsh) conditions such as Rim World.\n\nParticipating test subject can perform researches and acquire skills identical to typical human beings. However, under harsh circumstances, these test subjects seem to be "mentally unstable."\n\nTip : Boomabear produces chemfuel.</description>
diff --git a/1.6/Core/Patches/Royalty.xml b/1.6/Core/Patches/Royalty.xml
index 9e9fd51..a519630 100644
--- a/1.6/Core/Patches/Royalty.xml
+++ b/1.6/Core/Patches/Royalty.xml
@@ -9,7 +9,7 @@
       <operations>
         <!-- 오토마톤 면역 -->
         <li Class="PatchOperationAdd">
-          <xpath>/Defs/HediffDef[defName = "PanielBaseHediff"]/comps/li[@Class = "MoharHediffs.HediffCompProperties_HediffNullifier"]/hediffToNullify</xpath>
+          <xpath>/Defs/HediffDef[defName = "PanielBaseHediff"]/comps/li[@Class = "AutomataRace.MoharHediffs.HediffCompProperties_HediffNullifier"]/hediffToNullify</xpath>
           <value>
             <!--<li>BloodRot</li>
             <li>Abasia</li>-->
diff --git a/1.6/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml b/1.6/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml
index 61ec040..e8630b7 100644
--- a/1.6/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml
+++ b/1.6/Ideology/Defs/HediffDefs/Ideo_Hediffs_Cast_Spacer.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Defs>
 
-  <HediffDef Name="PN_HediffAsImplantBase" Abstract="True">
-    <hediffClass>HediffWithComps</hediffClass>
-    <isBad>false</isBad>
-    <defaultLabelColor>(0.6, 0.8, 0.7)</defaultLabelColor>
-    <scenarioCanAdd>true</scenarioCanAdd>
-    <makesSickThought>false</makesSickThought>
-    <tendable>false</tendable>
-    <countsAsAddedPartOrImplant>true</countsAsAddedPartOrImplant>
-  </HediffDef>
-
   <!--==================================== 전투 지휘 모듈 ====================================-->
   <HediffDef ParentName="RoleStatBuff">
     <defName>PN_OfficerCommand</defName>
@@ -32,7 +22,7 @@
           <canTargetMechs>false</canTargetMechs>
           <onlyTargetColonists>true</onlyTargetColonists>
         </targetingParameters>
-        <hediff><li>PN_OfficerCommandBuff</li></hediff>
+        <hediff>PN_OfficerCommandBuff</hediff>
       </li>
       <li Class="AutomataRace.MoharHediffs.HediffCompProperties_PostRemoveTrigger_HediffAdd">
         <triggeredHediff>
@@ -99,7 +89,7 @@
   <ThoughtDef>
     <defName>PN_OfficerCommandThought</defName>
     <workerClass>ThoughtWorker_Hediff</workerClass>
-    <hediff><li>PN_OfficerCommandBuff</li></hediff>
+    <hediff>PN_OfficerCommandBuff</hediff>
     <validWhileDespawned>true</validWhileDespawned>
     <stages>
       <li>
@@ -112,7 +102,7 @@
 
   <ThoughtDef>
     <defName>PN_OfficerCommandThoughtforPN</defName>
-    <workerClass>AutomataRace.ThoughtWorker_RaceBPHediff</workerClass>
+    <workerClass>AutomataRace.ThoughtWorker.ThoughtWorker_RaceBPHediff</workerClass>
     <stages>
       <li>
         <label>command from officer</label>
@@ -120,19 +110,17 @@
         <baseMoodEffect>5</baseMoodEffect>
       </li>
     </stages>
-    <modExtensions>
-      <li Class="AutomataRace.ThoughtWorkerDef_RaceBPHediff">
-        <race>Paniel_Race</race>
-        <hediff><li>PN_OfficerCommandBuff</li></hediff>
-        <bodyPart>PNBrain</bodyPart>
-        <bodyPartCount>
-          <min>1</min>
-          <max>999</max>
-        </bodyPartCount>
-      </li>
-    </modExtensions>
   </ThoughtDef>
 
+  <AutomataRace.MoharThoughts.MTWDef>
+    <defName>PNMTW_OfficerCommandThoughtforPN</defName>
+    <thought>PN_OfficerCommandThoughtforPN</thought>
+    <race>Paniel_Race</race>
+    <hediff>PN_OfficerCommandBuff</hediff>
+    <bodyPart>PNBrain</bodyPart>
+    <bpNum>1</bpNum>
+  </AutomataRace.MoharThoughts.MTWDef>
+
   <HediffDef>
     <defName>PN_OfficerCommandOverload</defName>
     <label>module overloaded</label>
@@ -511,19 +499,4 @@
       </li>
     </stages>
   </ThoughtDef>
-
-  <HediffDef ParentName="PN_HediffAsImplantBase">
-    <defName>PN_HediffMechanicNullifierSpacer</defName>
-    <label>Paniel Mechanic nullifier (spacer)</label>
-    <description>Paniel Mechanic nullifier (spacer).</description>
-    <hediffClass>HediffWithComps</hediffClass>
-    <comps>
-      <li Class="AutomataRace.MoharHediffs.HediffCompProperties_HediffNullifier">
-        <hediffToNullify>
-          <li>PN_MeisterAdvice</li>
-          <li>PN_IntensiveMedical</li>
-        </hediffToNullify>
-      </li>
-    </comps>
-  </HediffDef>
-</Defs>
\ No newline at end of file
+</Defs>
diff --git a/1.6/Mods/Paniel_Experimental/Defs/HediffDefs/HediffDef_PNE_BodyParts.xml b/1.6/Mods/Paniel_Experimental/Defs/HediffDefs/HediffDef_PNE_BodyParts.xml
index ecefece..e06d358 100644
--- a/1.6/Mods/Paniel_Experimental/Defs/HediffDefs/HediffDef_PNE_BodyParts.xml
+++ b/1.6/Mods/Paniel_Experimental/Defs/HediffDefs/HediffDef_PNE_BodyParts.xml
@@ -7,7 +7,6 @@
     <description>An experimental engine core. allow automata to power without fuel. using this can be extrame dangerous.\n\n
     
     Warning: This implant cannot be safety removed after installation.</description>
-    <hediffClass>HediffWithComps</hediffClass>
     <descriptionHyperlinks>
       <ThingDef>PN_ExperimentalEngineCore</ThingDef>
     </descriptionHyperlinks>
@@ -16,22 +15,14 @@
       <partEfficiency>1.1</partEfficiency>
       <betterThanNatural>true</betterThanNatural>
     </addedPartProps>
+    <disablesNeeds>
+      <li>PN_Need_Fuel</li>
+    </disablesNeeds>
     <stages>
       <li>
         <hungerRateFactorOffset>0.75</hungerRateFactorOffset>
 			</li>
     </stages>
-    <comps>
-      <!-- <li Class="HediffCompProperties_DisableNeed">
-        <needs>
-          <li>Outdoors</li>
-          <li>DrugDesire</li>
-          <li>RoomSize</li>
-          <li>Comfort</li>
-          <li MayRequire="Dubwise.DubsBadHygiene">Bladder</li>
-        </needs>
-      </li> -->
-    </comps>
   </HediffDef>
 
   <ThingDef ParentName="PN_BodyPartNormalBase">