diff --git a/src/uncategorized/pRivalryCapture.tw b/src/uncategorized/pRivalryCapture.tw
index eb8df43961a91ad5c373b4524a908d8c78eceb82..79d240e325f6ee3da64211dfcee4056abec1a429 100644
--- a/src/uncategorized/pRivalryCapture.tw
+++ b/src/uncategorized/pRivalryCapture.tw
@@ -24,13 +24,12 @@
 <</if>>
 <<set _rivalType = _rivalType.random()>>
 
-<<set $oneTimeDisableDisability = 1>>
-<<if setup.filterRacesLowercase.includes($rivalRace)>><<set $fixedRace = $rivalRace>><</if>>
+<<if setup.filterRacesLowercase.includes($rivalRace)>>
+	<<set _race = $rivalRace>>
+<</if>>
 <<switch _rivalType>>
 <<case "expansionist shemale">>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XY")>>
+	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 100>>
 	<<set $activeSlave.faceImplant = 15>>
 	<<set $activeSlave.faceShape = "androgynous">>
@@ -62,9 +61,7 @@
 	<<set $activeSlave.hStyle = "luxurious">>
 	<<set $activeSlave.hLength = 80>>
 <<case "cum addict">>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XY")>>
+	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.chem = 3000>>
 	<<set $activeSlave.face = 100>>
 	<<set $activeSlave.faceShape = "masculine">>
@@ -95,9 +92,7 @@
 	<<set $activeSlave.hStyle = "neat">>
 	<<set $activeSlave.hLength = 20>>
 <<case "hung shota">>
-	<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
-	<<set $activeSlaveOneTimeMaxAge = 18>>
-	<<set $activeSlave = GenerateNewSlave("XY")>>
+	<<set $activeSlave = GenerateNewSlave("XY", {minAge: $minimumSlaveAge, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 100>>
 	<<set $activeSlave.faceShape = "androgynous">>
 	<<set $activeSlave.muscles = 0>>
@@ -126,9 +121,7 @@
 	<<set $activeSlave.sexualQuirk = "perverted">>
 	<<set $activeSlave.hLength = 20>>
 <<case "masculine">>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XY")>>
+	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 55>>
 	<<set $activeSlave.faceImplant = 0>>
 	<<set $activeSlave.faceShape = "masculine">>
@@ -155,9 +148,7 @@
 	<<set $activeSlave.hStyle = "neat">>
 	<<set $activeSlave.hLength = 5>>
 <<case "micropenis">>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XY")>>
+	<<set $activeSlave = GenerateNewSlave("XY", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 55>>
 	<<set $activeSlave.faceImplant = 0>>
 	<<set $activeSlave.faceShape = "masculine">>
@@ -184,9 +175,7 @@
 	<<set $activeSlave.hStyle = "neat">>
 	<<set $activeSlave.hLength = 5>>
 <<case "bull dyke">>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XX")>>
+	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 55>>
 	<<set $activeSlave.faceImplant = 0>>
 	<<set $activeSlave.faceShape = "androgynous">>
@@ -221,13 +210,13 @@
 	<<set $activeSlave.hLength = 5>>
 <<case "breeder">>
 	<<if $pedo_mode == 1>>
-		<<set $activeSlaveOneTimeMinAge = ($fertilityAge + 6)>>
-		<<set $one_time_age_overrides_pedo_mode = 1>> /% Old enough to have been pregnant many times. %/
+		<<set _minAge = ($fertilityAge + 6)>>
+		<<set _pedo = 1>> /* Old enough to have been pregnant many times. */
 	<<else>>
-		<<set $activeSlaveOneTimeMinAge = 18>>
-		<<set $activeSlaveOneTimeMaxAge = 42>>
+		<<set _minAge = 18>>
+		<<set _maxAge = 42>>
 	<</if>>
-	<<set $activeSlave = GenerateNewSlave("XX")>>
+	<<set $activeSlave = GenerateNewSlave("XX", {minAge: _minAge, maxAge: _maxAge, ageOverridesPedoMode: _pedo, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.pubertyXX = 1>>
 	<<set $activeSlave.face = 100>>
 	<<set $activeSlave.faceImplant = 0>>
@@ -279,9 +268,7 @@
 	<<set $activeSlave.hStyle = "luxurious">>
 	<<set $activeSlave.hLength = 80>>
 <<case "oppai loli">>
-	<<set $activeSlaveOneTimeMinAge = $minimumSlaveAge>>
-	<<set $activeSlaveOneTimeMaxAge = 12>>
-	<<set $activeSlave = GenerateNewSlave("XX")>>
+	<<set $activeSlave = GenerateNewSlave("XX", {minAge: $minimumSlaveAge, maxAge: 12, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 100>>
 	<<set $activeSlave.faceImplant = 0>>
 	<<set $activeSlave.faceShape = "cute">>
@@ -309,9 +296,7 @@
 	<<set $activeSlave.hStyle = "twin tails">>
 	<<set $activeSlave.hLength = 40>>
 <<case "cow">>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XX")>>
+	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 55>>
 	<<set $activeSlave.faceImplant = 0>>
 	<<set $activeSlave.faceShape = "cute">>
@@ -340,9 +325,7 @@
 	<<set $activeSlave.hStyle = "neat">>
 	<<set $activeSlave.hLength = 5>>
 <<case "bimbo">>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XX")>>
+	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 100>>
 	<<set $activeSlave.faceImplant = 65>>
 	<<set $activeSlave.faceShape = "sensual">>
@@ -374,9 +357,7 @@
 	<<set $activeSlave.hStyle = "tails">>
 	<<set $activeSlave.hLength = 80>>
 <<default>>
-	<<set $activeSlaveOneTimeMinAge = 18>>
-	<<set $activeSlaveOneTimeMaxAge = 42>>
-	<<set $activeSlave = GenerateNewSlave("XX")>>
+	<<set $activeSlave = GenerateNewSlave("XX", {minAge: 18, maxAge: 42, race: _race, disableDisability: 1})>>
 	<<set $activeSlave.face = 100>>
 	<<set $activeSlave.faceImplant = 15>>
 	<<set $activeSlave.muscles = 0>>