diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
index 5b7caa5..0597cac 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Breast.cs
@@ -158,6 +158,14 @@ namespace RJW_Menstruation
             Scribe_Values.Look(ref baseNipple, "baseNipple", baseNipple, true);
         }
 
+        public bool ShouldSimulate()
+        {
+            if (!Configurations.EnableAnimalCycle && Pawn.IsAnimal()) return false;
+            if (Pawn.Spawned) return true;
+
+            return false;
+        }
+
         public override void CompPostTick(ref float severityAdjustment)
         {
             base.CompPostTick(ref severityAdjustment);
@@ -166,7 +174,7 @@ namespace RJW_Menstruation
             {
                 if (
                     !Pawn.IsHashIntervalTick(tickInterval) ||
-                    !Pawn.Spawned  // TODO: Add option to simulate off-map pawns
+                    !ShouldSimulate()
                     )
                 {
                     return;
diff --git a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
index 892a780..ec860df 100644
--- a/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
+++ b/1.3/source/RJW_Menstruation/RJW_Menstruation/HediffComps/HediffComp_Menstruation.cs
@@ -549,6 +549,14 @@ namespace RJW_Menstruation
             }
         }
 
+        public bool ShouldSimulate()
+        {
+            if (!Configurations.EnableAnimalCycle && Pawn.IsAnimal()) return false;
+            if (Pawn.Spawned) return true;
+
+            return false;
+        }
+
         public override void CompPostTick(ref float severityAdjustment)
         {
             base.CompPostTick(ref severityAdjustment);
@@ -557,8 +565,7 @@ namespace RJW_Menstruation
             {
                 if (
                     !Pawn.IsHashIntervalTick(tickInterval) ||
-                    !Pawn.Spawned || // TODO: Add option to simulate off-map pawns
-                    (Pawn.IsAnimal() && !Configurations.EnableAnimalCycle)
+                    !ShouldSimulate()
                     )
                 {
                     return;