diff --git a/1.6/Animal Genetics/Assemblies/Animal Genetics.dll b/1.6/Animal Genetics/Assemblies/Animal Genetics.dll
index 3591631..e28598f 100644
Binary files a/1.6/Animal Genetics/Assemblies/Animal Genetics.dll and b/1.6/Animal Genetics/Assemblies/Animal Genetics.dll differ
diff --git a/1.6/Assemblies/RJW_Menstruation.dll b/1.6/Assemblies/RJW_Menstruation.dll
index 2dcbb04..86b2376 100644
Binary files a/1.6/Assemblies/RJW_Menstruation.dll and b/1.6/Assemblies/RJW_Menstruation.dll differ
diff --git a/1.6/Humanoid Alien Races/Assemblies/HAR.dll b/1.6/Humanoid Alien Races/Assemblies/HAR.dll
index 90ec171..611da42 100644
Binary files a/1.6/Humanoid Alien Races/Assemblies/HAR.dll and b/1.6/Humanoid Alien Races/Assemblies/HAR.dll differ
diff --git a/1.6/Patches/RJW_PawnTableDefs.xml b/1.6/Patches/RJW_PawnTableDefs.xml
index 3548ef3..edbc555 100644
--- a/1.6/Patches/RJW_PawnTableDefs.xml
+++ b/1.6/Patches/RJW_PawnTableDefs.xml
@@ -2,12 +2,6 @@
 <Patch>
   <Operation Class="PatchOperationSequence">
     <operations>
-      <li Class="PatchOperationInsert">
-        <xpath>/Defs/PawnTableDef[defName="RJW_PawnTable_Humanlikes"]/columns/li[text()="Pregnant"]</xpath>
-        <value>
-          <li>RJWMenstruation_Womb</li>
-        </value>
-      </li>
       <li Class="PatchOperationInsert">
         <xpath>/Defs/PawnTableDef[defName="RJW_PawnTable_Colonists"]/columns/li[text()="Pregnant"]</xpath>
         <value>
diff --git a/1.6/Quirks/Assemblies/Quirks.dll b/1.6/Quirks/Assemblies/Quirks.dll
index 7f771af..91a4a19 100644
Binary files a/1.6/Quirks/Assemblies/Quirks.dll and b/1.6/Quirks/Assemblies/Quirks.dll differ
diff --git a/1.6/Vanilla Expanded Core/Assemblies/VECore.dll b/1.6/Vanilla Expanded Core/Assemblies/VECore.dll
index 968020c..f47a501 100644
Binary files a/1.6/Vanilla Expanded Core/Assemblies/VECore.dll and b/1.6/Vanilla Expanded Core/Assemblies/VECore.dll differ
diff --git a/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
index 188608b..afca25e 100644
--- a/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
+++ b/1.6/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
@@ -126,7 +126,7 @@ namespace RJW_Menstruation
         protected int? opcache = null;
         protected float antisperm = 0.0f;
         // RJW pregnancy, or Biotech pregnancy/labor/laborpushing
-        protected Hediff pregnancy = null;
+        protected Hediff pregnancy = null;      // Remove, instead reference per-genital pregnancy list
 
         protected int eggLifeSpanTicks = GenDate.DaysToTicks(2);
         protected EstrusLevel estrusLevel = EstrusLevel.Visible;
@@ -313,7 +313,7 @@ namespace RJW_Menstruation
                 {
                     StatDefOf.Fertility.Worker.ClearCacheForThing(Pawn);    // No effect for now, but a future RW update might add caching for this
                     calculatingOvulationChance = true;
-                    ovulationChance *= PawnCapacityUtility.CalculateCapacityLevel(Pawn.health.hediffSet, xxx.reproduction);
+                    ovulationChance *= PawnCapacityUtility.CalculateCapacityLevel(Pawn.health.hediffSet, xxx.reproduction); // Add genital fertility
                 }
                 finally
                 {                    
@@ -1481,7 +1481,7 @@ namespace RJW_Menstruation
                     try
                     {
                         if (Configurations.Debug) Log.Message($"Implanting fertilized egg of {Pawn} into {parent}, father {egg.fertilizer}");
-                        if (pregnancy == null)
+                        if (pregnancy == null)  // Support pregnancy list, maybe split off into function
                         {
                             Configurations.PregnancyType usePregnancy = xxx.is_human(Pawn) ? Configurations.PregnancySource : Configurations.PregnancyType.MultiplePregnancy;
                             switch (usePregnancy)
@@ -1499,7 +1499,7 @@ namespace RJW_Menstruation
 
                                 case Configurations.PregnancyType.MultiplePregnancy:
                                     if (Configurations.Debug) Log.Message($"Creating new menstruation pregnancy");
-                                    pregnancy = Hediff_BasePregnancy.Create<Hediff_MultiplePregnancy>(Pawn, egg.fertilizer);
+                                    pregnancy = Hediff_BasePregnancy.Create<Hediff_MultiplePregnancy>(Pawn, egg.fertilizer);    // Add fertility comp of mother
                                     pregnant = true;
                                     deadeggs.Add(egg);
                                     break;
diff --git a/About/Manifest.xml b/About/Manifest.xml
index a0e5926..bef173d 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
 	<identifier>RJW Menstruation</identifier>
-	<version>1.6.2.3</version>
+	<version>1.6.2.4</version>
 	<dependencies>
 	</dependencies>
 	<incompatibleWith />
diff --git a/changelogs.txt b/changelogs.txt
index fcd64af..7316879 100644
--- a/changelogs.txt
+++ b/changelogs.txt
@@ -1,3 +1,6 @@
+Version 1.6.2.4
+ - Fix error on startup and missing womb status in RJW tab with RJW 6.1.4.
+
 Version 1.6.2.3
  - Fix multiple breasts not appearing in the menstruation UI.
  - Status of wombs now appears in RJW main tab, contributed by GhostClinic.