diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
index 8817372..8c91cb6 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Hediff_MultiplePregnancy.cs
@@ -238,6 +238,7 @@ namespace RJW_Menstruation
             // A bit wasteful since Hediff_BasePregnancy.PostBirth already redid the genitals
             CopyBodyPartRecord(baby, original, Genital_Helper.get_genitalsBPR(baby), Genital_Helper.get_genitalsBPR(original));
             CopyBodyPartRecord(baby, original, Genital_Helper.get_breastsBPR(baby), Genital_Helper.get_breastsBPR(original));
+            CopyBodyPartRecord(baby, original, Genital_Helper.get_uddersBPR(baby), Genital_Helper.get_uddersBPR(original));
             CopyBodyPartRecord(baby, original, Genital_Helper.get_anusBPR(baby), Genital_Helper.get_anusBPR(original));
             if (baby.IsHAR())
                 HARCompatibility.CopyHARPropertiesPostBirth(baby, original);
diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Recipe_Surgery.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Recipe_Surgery.cs
index c34c0e9..fce3e53 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Recipe_Surgery.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Recipe_Surgery.cs
@@ -16,7 +16,7 @@ namespace RJW_Menstruation
                 yield break;
             }
 
-            BodyPartRecord part = Genital_Helper.get_breastsBPR(pawn);
+            BodyPartRecord part = Genital_Helper.get_breastsBPR(pawn) ?? Genital_Helper.get_uddersBPR(pawn);
             if (part != null)
             {
 
diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
index 3292c36..a2ba785 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/Utility.cs
@@ -97,9 +97,10 @@ namespace RJW_Menstruation
 
         public static HediffComp_Breast GetBreastComp(this Pawn pawn)
         {
-            List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn))?.FindAll((Hediff h) => h is Hediff_PartBaseNatural || h is Hediff_PartBaseArtifical);
-            HediffComp_Breast result;
+            List<Hediff> hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn))?.FindAll(h => VariousDefOf.AllBreasts.Contains(h.def));
+            if (hedifflist.NullOrEmpty()) hedifflist = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn))?.FindAll(h => VariousDefOf.AllBreasts.Contains(h.def));
             if (hedifflist.NullOrEmpty()) return null;
+            HediffComp_Breast result;
             foreach (Hediff h in hedifflist)
             {
                 result = h.TryGetComp<HediffComp_Breast>();
@@ -165,9 +166,9 @@ namespace RJW_Menstruation
 
         public static void DrawBreastIcon(this Pawn pawn, Rect rect)
         {
-            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("breast"));
+            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
             if (hediff == null)
-                hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("breast"));
+                hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
             Texture2D breast, nipple, areola;
             if (hediff != null)
             {
@@ -336,7 +337,8 @@ namespace RJW_Menstruation
         }
         public static string GetBreastLabel(this Pawn pawn)
         {
-            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault((Hediff h) => h.def.defName.ToLower().Contains("breast"));
+            Hediff hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_breastsBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
+            if (hediff == null) hediff = Genital_Helper.get_PartsHediffList(pawn, Genital_Helper.get_uddersBPR(pawn)).FirstOrDefault(h => VariousDefOf.AllBreasts.Contains(h.def));
             if (hediff != null) return hediff.LabelBase.CapitalizeFirst() + "\n(" + hediff.LabelInBrackets + ")";
             else return "";
         }
diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
index 71d28a9..606cb22 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/VariousDefOf.cs
@@ -1,5 +1,6 @@
 using RimWorld;
 using rjw;
+using rjw.Modules.Interactions.Rules.PartKindUsageRules.Implementation;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -49,6 +50,7 @@ namespace RJW_Menstruation
         private static List<ThingDef> allraces = null;
         private static List<PawnKindDef> allkinds = null;
         private static HashSet<HediffDef> allvaginas = null;
+        private static HashSet<HediffDef> allbreasts = null;
 
         public static List<ThingDef> AllRaces
         {
@@ -95,6 +97,29 @@ namespace RJW_Menstruation
                 return allvaginas;
             }
         }
+        public static HashSet<HediffDef> AllBreasts
+        {
+            get
+            {
+                if (allbreasts != null) return allbreasts;
+                allbreasts = new HashSet<HediffDef>();
+
+                foreach(HediffDef hediffDef in DefDatabase<HediffDef>.AllDefsListForReading)
+                {
+                    if (hediffDef.comps.NullOrEmpty()) continue;
+                    foreach(HediffCompProperties comp in hediffDef.comps)
+                    {
+                        if (comp.compClass == typeof(HediffComp_Breast) || (comp.compClass?.IsSubclassOf(typeof(HediffComp_Breast)) ?? false))
+                        {
+                            allbreasts.Add(hediffDef);
+                            break;
+                        }
+                    }
+                }
+
+                return allbreasts;
+            }
+        }
 
         // Defs from Milkable Colonists
         public static readonly HediffDef Hediff_Lactating_Drug = DefDatabase<HediffDef>.GetNamedSilentFail("Lactating_Drug");