diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index 7ee9252d561e11d2d883a889f5c56c6aa54115c2..1adbbe559732a47a2abddb9f86f0b10e6625c847 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -2616,9 +2616,6 @@ vaginalAccessory:
 
 may accept strings, use at own risk
 "none"
-"chastity belt"
-"combined chastity"
-"anal chastity"
 "dildo"
 "large dildo"
 "huge dildo"
@@ -2630,9 +2627,24 @@ dickAccessory:
 
 may accept strings, use at own risk
 "none"
-"chastity"
-"anal chastity"
-"combined chastity"
+
+chastityAnus:
+
+whether the slave has a chastity device on their anus
+0 - no
+1 - yes
+
+chastityPenis:
+
+whether the slave has a chastity device on their penis
+0 - no
+1 - yes
+
+chastityVagina:
+
+whether the slave has a chastity device on their vagina
+0 - no
+1 - yes
 
 legAccessory:
 
diff --git a/src/art/vector/Body_Clothing_Control.tw b/src/art/vector/Body_Clothing_Control.tw
index d01188ea54bbfcc2979d2df49b306b611ca7990a..3bcbcde8dd374d284bd038264c86f86210c9fe4b 100644
--- a/src/art/vector/Body_Clothing_Control.tw
+++ b/src/art/vector/Body_Clothing_Control.tw
@@ -34,9 +34,9 @@
 <<set _showHeadHighlight = 1>>
 <<set _showBellyPiercings = 1>>
 <<set _showNipplePiercings = 1>>
-<<set _chastityAnal = _artSlave.dickAccessory == "anal chastity" || _artSlave.dickAccessory == "combined chastity" || _artSlave.vaginalAccessory == "anal chastity" || _artSlave.vaginalAccessory == "combined chastity" >>
+<<set _chastityAnal = _artSlave.chastityAnus == 1>>
 
-<<set _chastityVaginal = _artSlave.vaginalAccessory == "chastity belt" || _artSlave.vaginalAccessory == "combined chastity">>
+<<set _chastityVaginal = _artSlave.chastityVagina == 1>>
 
 <<if _artSlave.fuckdoll > 0>>
 	<<set _showEyes = 0>>
diff --git a/src/facilities/nursery/childInteract.tw b/src/facilities/nursery/childInteract.tw
index 7da46bfed796f1e260bb68de4d26f9be55253326..cbbae1db278b10a74664ce81a2cce1240290db45 100644
--- a/src/facilities/nursery/childInteract.tw
+++ b/src/facilities/nursery/childInteract.tw
@@ -552,8 +552,8 @@
 		<<if $activeChild.vagina >= 2>>| <<link "Huge and long dildo">><<set $activeChild.vaginalAccessory = "long, huge dildo">><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><</link>><</if>>
 	<</if>>
 	| <<link "Chastity belt">><<set $activeChild.chastityVagina = 1,$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-	| <<link "Anal chastity belt">><<set $activeChild.chastityAnis = 1,$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-	| <<link "Combined chastity belt">><<set $activeChild.vaginalAccessory = "combined chastity",$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+	| <<link "Anal chastity belt">><<set $activeChild.chastityAnus = 1,$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+	| <<link "Combined chastity belt">><<set $activeChild.chastityAnus = 1, $activeChild.chastityVagina = 1,$activeChild.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeChild.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
 <</if>>
 <<if $activeChild.dick > 0>>
 	<br>Dick accessory: ''<span id="dickAccessory">$activeChild.dickAccessory</span>.''
diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw
index 3ea7be4ba4e55507bf80168cf1c10708d379e425..81b2e46b670f9365a6ff584cc0bb2155b4bf013e 100644
--- a/src/pregmod/widgets/seBirthWidgets.tw
+++ b/src/pregmod/widgets/seBirthWidgets.tw
@@ -184,7 +184,7 @@
 	<<if $slaves[$i].vagina > 2>>
 		<<set $suddenBirth += 2>>
 	<</if>>
-	<<if $slaves[$i].vaginalAccessory != "none">>
+	<<if $slaves[$i].vaginalAccessory != "none" || $slaves[$i].chastityVagina == 1>>
 		<<set $suddenBirth -= 20>>
 	<</if>>
 <</if>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index b9d33da45111c4d96b7f19a72e5159bffa3b340c..e93755ebfd588a9b4374900a09b58b912b629ce6 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -3290,6 +3290,32 @@ Setting missing slave variables:
 	<<set _Slave.pregControl = "labor suppressors">>
 <</if>>
 
+<<if ndef _Slave.chastityAnus || ndef _Slave.chastityPenis || _Slave.chastityPenis>>
+	<<if _Slave.dickAccessory == "combined chastity">>
+		<<set _Slave.chastityAnus = 1>>
+		<<set _Slave.chastityPenis = 1>>	
+		<<set _Slave.dickAccessory = "none">>		
+	<<elseif _Slave.vaginalAccessory == "combined chastity">>
+		<<set _Slave.chastityAnus = 1>>
+		<<set _Slave.chastityVagina = 1>>
+		<<set _Slave.vaginalAccessory = "none">>
+	<<elseif _Slave.dickAccessory == "anal chastity" || _Slave.vaginalAccessory == "anal chastity">>
+		<<set _Slave.chastityAnus = 1>>
+		<<set _Slave.dickAccessory = "none">>
+		<<set _Slave.vaginalAccessory = "none">>
+	<<elseif _Slave.dickAccessory == "chastity">>
+		<<set _Slave.chastityPenis = 1>>
+		<<set _Slave.dickAccessory = "none">>
+	<<elseif _Slave.vaginalAccessory == "chastity belt">>
+		<<set _Slave.chastityVagina = 1>>
+		<<set _Slave.vaginalAccessory = "none">>
+	<<else>>
+		<<set _Slave.chastityAnus = 0>>
+		<<set _Slave.chastityPenis = 0>>
+		<<set _Slave.chastityVagina = 0>>
+	<</if>>
+<</if>>
+
 <<run SlaveDatatypeCleanup(_Slave)>>
 
 <<set _leaderIdx = $leaders.findIndex(function(s) { return s.ID === _Slave.ID; })>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 44931643020b73941a5c761360e58f7daa12af2a..bc81c80cc44f98b99ccb0d6332351582838f9cec 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -145,7 +145,7 @@ $His $activeSlave.skin face displays nothing but honest gratitude and devotion.
 <</for>>
 
 <<EventNameLink>> is the second slave on the inspection schedule for today. $He comes into your office naked, to find that the first inspection is going a little long. The slave before $him is obediently riding <<if ($PC.dick == 0)>>one of your larger strap-ons<<else>>your cock<</if>>. $He waits patiently, but does not bother to hide $his arousal at the lewd sight. $He obviously wants to be next;
-<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity")>>
+<<if ($activeSlave.dick > 0) && ($activeSlave.chastityPenis == 1)>>
 	$his chastity cage is dribbling precum, and $he's clearly uncomfortable with simultaneous arousal and unwillingness to suffer a hard-on inside it
 <<elseif ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
 	$his cock is painfully erect
@@ -291,7 +291,7 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 
 <<if $HeadGirl != 0>>
 <<if ($activeSlave.ID != $HeadGirl.ID)>>
-<<if ($HeadGirl.dick == 0) || (($HeadGirl.dick > 1) && canAchieveErection($HeadGirl) && ($HeadGirl.dickAccessory != "chastity"))>>
+<<if ($HeadGirl.dick == 0) || (($HeadGirl.dick > 1) && canAchieveErection($HeadGirl) && ($HeadGirl.chastityPenis == 0))>>
 <<link "Double anal with the Head Girl">>
 	<<setLocalPronouns $HeadGirl 2>>
 	<<EventNameDelink $activeSlave>>
@@ -314,13 +314,13 @@ $He looks pensive, and goes through two false starts before $he clears $his thro
 	<<replace "#result">>
 	You tell $him $he's got a nice asspussy, and grope $him thoroughly, cupping $his buttocks with one hand and squeezing a breast with the other. $activeSlave.slaveName looks <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>desperately eager<<else>>ready and willing<</if>>, and angles $himself just right, but you administer a light slap to $his $activeSlave.skin ass and continue, telling $him that it's so nice you feel like sharing it. $He's <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>so ready to fuck $he can't quite think of what to say<<else>>not quite sure how to respond<</if>>, and before $he can figure it out, $HeadGirl.slaveName hurries in, responding to your summons. Of course, $activeSlave.slaveName is no stranger to $HeadGirl.slaveName, who takes in the situation at a glance and <<if $HeadGirl.dick > 0>>instantly achieves a painfully hard erection<<else>>immediately flushes with arousal<</if>>. $HeadGirl.slaveName<<if $HeadGirl.dick == 0>> dons a strap-on and<</if>> clambers up onto the (strongly built) bathroom counter. Since saliva is plenty of lube for $activeSlave.slaveName's experienced ass, _he2 points a meaningful finger at <<if $HeadGirl.dick == 0>>the phallus<<else>>_his2 cock<</if>>, and $activeSlave.slaveName begins to suck it enthusiastically, trying to get it as wet as possible for the sake of $his butt.
 	<br><br>
-	Since $activeSlave.slaveName is being so good, you decide to help get $him ready, and push $him sideways so $he straddles the counter's edge. $He whimpers into the <<if $HeadGirl.dick == 0>>dildo<<else>>dick<</if>> in $his mouth as $he feels $his <<if $activeSlave.dick > 0>><<if ($activeSlave.hormoneBalance >= 100) || ($activeSlave.dickAccessory == "chastity")>>chastity cage<<elseif ($activeSlave.hormoneBalance >= 100) || ($activeSlave.balls == 0) || ($activeSlave.ballType == "sterile")>>soft dickclit<<else>>hard cock<</if>><<else>>mons<</if>> graze the hard counter, and then stiffens as you penetrate $his bottom. When you judge that your Head Girl is wet enough, you nod to _him2, and _he2 takes $activeSlave.slaveName by the hand, pulling $him up onto _his2 lap.
+	Since $activeSlave.slaveName is being so good, you decide to help get $him ready, and push $him sideways so $he straddles the counter's edge. $He whimpers into the <<if $HeadGirl.dick == 0>>dildo<<else>>dick<</if>> in $his mouth as $he feels $his <<if $activeSlave.dick > 0>><<if ($activeSlave.hormoneBalance >= 100) || ($activeSlave.chastityPenis == 1)>>chastity cage<<elseif ($activeSlave.hormoneBalance >= 100) || ($activeSlave.balls == 0) || ($activeSlave.ballType == "sterile")>>soft dickclit<<else>>hard cock<</if>><<else>>mons<</if>> graze the hard counter, and then stiffens as you penetrate $his bottom. When you judge that your Head Girl is wet enough, you nod to _him2, and _he2 takes $activeSlave.slaveName by the hand, pulling $him up onto _his2 lap.
 	<<if ($HeadGirl.boobs > 4000) && ($activeSlave.boobs > 4000)>>
 		Their tits are so huge that they can't reach each other to kiss, chest-to-chest like that. $HeadGirl.slaveName settles for blowing the other slave an exaggerated kiss, which makes $him laugh.
 	<<else>>
 		The slaves start making out, showing no signs of breaking their lip lock as they arrange themselves for penetration.
 	<</if>>
-	$HeadGirl.slaveName guides _his2 <<if $HeadGirl.dick == 0>>strap-on<<else>>cock<</if>> inside the <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>enthusiastic<<else>>compliant<</if>> $activeSlave.slaveName, who begins to ride it, enjoying both the <<if $activeSlave.dick > 0>>prostate<<else>>anal<</if>> stimulation and the feeling of $his <<if $activeSlave.dick > 0>><<if ($activeSlave.hormoneBalance >= 100) || ($activeSlave.dickAccessory == "chastity")>>midsection trapped between $him and <<elseif ($activeSlave.hormoneBalance >= 100) || ($activeSlave.balls == 0) || ($activeSlave.ballType == "sterile")>>soft dick trapped between $him and <<else>>erection trapped between $him and <</if>><<else>>pussy pressed against<</if>> $HeadGirl.slaveName. $HeadGirl.slaveName smacks the humping <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>'s butt to get $him to stop, and slides an index finger up $his ass alongside the <<if $HeadGirl.dick == 0>>phallus<<else>>cock<</if>>. $activeSlave.slaveName shudders, and then begins to whine as $HeadGirl.slaveName pulls $his sphincter wider.
+	$HeadGirl.slaveName guides _his2 <<if $HeadGirl.dick == 0>>strap-on<<else>>cock<</if>> inside the <<if ($activeSlave.fetish == "buttslut") && ($activeSlave.fetishKnown == 1)>>enthusiastic<<else>>compliant<</if>> $activeSlave.slaveName, who begins to ride it, enjoying both the <<if $activeSlave.dick > 0>>prostate<<else>>anal<</if>> stimulation and the feeling of $his <<if $activeSlave.dick > 0>><<if ($activeSlave.hormoneBalance >= 100) || ($activeSlave.chastityPenis == 1)>>midsection trapped between $him and <<elseif ($activeSlave.hormoneBalance >= 100) || ($activeSlave.balls == 0) || ($activeSlave.ballType == "sterile")>>soft dick trapped between $him and <<else>>erection trapped between $him and <</if>><<else>>pussy pressed against<</if>> $HeadGirl.slaveName. $HeadGirl.slaveName smacks the humping <<if $activeSlave.physicalAge > 30>>$woman<<else>>$girl<</if>>'s butt to get $him to stop, and slides an index finger up $his ass alongside the <<if $HeadGirl.dick == 0>>phallus<<else>>cock<</if>>. $activeSlave.slaveName shudders, and then begins to whine as $HeadGirl.slaveName pulls $his sphincter wider.
 	<br><br>
 	"Plea<<s>>e," the slave begs incoherently as you press your <<if $PC.dick == 1>>dick<<else>>strap-on<</if>> against $HeadGirl.slaveName's finger. It's not clear whether $he's begging you to DP $his anus, or begging you not to, but whichever it is, $HeadGirl.slaveName withdraws _his2 finger and you shove yourself inside. $activeSlave.slaveName jerks with discomfort and gives a gasping "Oh f-fuck-k" that <<if $activeSlave.anus > 2>>$he repeats over and over<<else>>is followed by some minor struggling<</if>> as you begin to fuck $him. From _his2 angle, $HeadGirl.slaveName can't pound $activeSlave.slaveName quite as hard as you can, but _he2 does _his2 best. When you've both had your fun, extracted yourselves, and let the exhausted, gaped bitch collapse onto the floor, $HeadGirl.slaveName gives you a naughty wink.
 	<<run Enunciate($HeadGirl)>>
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 289d8c0a00e6a04cd5c89cba76a9f439298d52cb..8db292c7b54dc93de225e6910a16815541e12054 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -10351,7 +10351,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 		<<else>>
 			<<if $activeSlave.vagina == -1>>
 				reaches around to finger $his butt, since that's $his only hole.
-			<<elseif $activeSlave.vaginalAccessory == "chastity">>
+			<<elseif $activeSlave.chastityVagina == 1>>
 				reaches around to finger $his butt, since $his pussy's in chastity.
 			<<else>>
 				dives for $his pussy with both hands.
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 24e17dc73e05cb6f7b850be464274d5415ae4ba8..4223ff9c0c46da4ada5deee3ffbb163608221e56 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -981,7 +981,7 @@ $activeSlave.slaveName shifts a little, and giggles.
 	"And it'<<s>> even more fun <<s>>in<<c>>e we're doing it now. Ooh,
 <</if>>
 <<set _hands = "anus">>
-<<if $activeSlave.dick > 0 && $activeSlave.dickAccessory == "none">>
+<<if $activeSlave.dick > 0 && $activeSlave.chastityPenis == 0>>
 	harder, <<s>>weetie." $subSlave.slaveName's hands aren't visible, but $his lewd movements make it obvious that $he's <<if canAchieveErection($activeSlave)>>giving $his _mother a handjob<<else>>playing with $his _mother's limp dick<</if>>
 	<<set $activeSlave.oralCount++, $subSlave.oralCount++, $oralTotal+2>>
 	<<set _hands = "dick">>
@@ -2241,7 +2241,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<br><br>
 	<<run Enunciate($subSlave)>>
 	$subSlave.slaveName <<if $activeSlave.nipples != "fuckable">>lets the nipple pop free of<<else>>releases the nipple from<</if>> _his2 mouth and looks up at $activeSlave.slaveName. "That'<<s>> <<s>>illy, _mommy," _he2 scolds, using an exaggeratedly whiny tone. I'm
-	<<if $activeSlave.dick > 0 && $activeSlave.dickAccessory == "none">>jerking you off,
+	<<if $activeSlave.dick > 0 && $activeSlave.chastityPenis == 0>>jerking you off,
 	<<elseif canDoVaginal($activeSlave)>>fingerbanging you,
 	<<elseif canDoAnal($activeSlave)>>fingerfucking your butthole,
 	<<else>>giving you a handjob,
diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw
index 1cbf815548fd93855b2a7735671f4b71a24928fe..5b30d800293df4d4f125bc5b6dca50b85123e0bf 100644
--- a/src/uncategorized/reShelterInspection.tw
+++ b/src/uncategorized/reShelterInspection.tw
@@ -179,7 +179,7 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema
 		<<run cashX(forceNeg($contractCost/2), "slaveTransfer", $activeSlave)>>
 		<<replace "#result">>
 		You have _him2 ushered up to your office, and order _Inspectee.slaveName brought in. The inspector has a single moment to stiffen in shock at the sight before _he2 stiffens involuntarily due to the security drone tasing _him2 unconscious. It takes a few credits here and there to circumvent the Shelter's various legal and contractual defenses to prevent slaveowners from doing exactly what you're doing, but you finish the day richer by one more Fuckdoll. Odds are _he2 wants to be defiant, but the suit works perfectly and leaves _him2 no outlet to make _his2 thoughts known.
-		<<set $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels",$activeSlave.legAccessory="none", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1>>
+		<<set $activeSlave.toyHole="all her holes", $activeSlave.pubicHStyle="waxed", $activeSlave.livingRules="spare", $activeSlave.speechRules="restrictive", $activeSlave.releaseRules="restrictive", $activeSlave.relationshipRules="restrictive", $activeSlave.fuckdoll=1, $activeSlave.choosesOwnClothes=0, $activeSlave.clothes="a Fuckdoll suit", $activeSlave.collar="none", $activeSlave.shoes="heels",$activeSlave.legAccessory="none", $activeSlave.vaginalAccessory="none", $activeSlave.dickAccessory="none", $activeSlave.buttplug="none", $activeSlave.chastityAnus = 0, $activeSlave.chastityPenis = 0, $activeSlave.chastityVagina = 0, $activeSlave.attrKnown=1, $activeSlave.fetishKnown=1>>
 		<<set $shelterAbuse += 10>>
 		<<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */
 		<<run newSlave($activeSlave)>> /* skip New Slave Intro */
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 85799a2c4f8261181ae1e70da46c290f5b55aac9..3a59b6cb93eb683a6c5278e7e8c5a1e631386e3b 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1067,7 +1067,7 @@
 		<</if>>
 		| <<link "Chastity belt">><<set $activeSlave.chastityVagina = 1,$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
 		| <<link "Anal chastity belt">><<set $activeSlave.chastityAnus = 1,$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
-		| <<link "Combined chastity belt">><<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+		| <<link "Combined chastity belt">><<set $activeSlave.chastityAnus -\= 1,$activeSlave.chastityVagina = 1,$activeSlave.choosesOwnChastity = 0>><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
 	<</if>>
 
 	<<if $activeSlave.dick > 0>>
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 4e943fa5f2e7ecd5f2965f8e7fa7269392af4332..8539dfd7ba470e42019df9f5cfeb977f08160bae 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -1074,7 +1074,7 @@ Chastity device:
 <<if $activeSlave.vagina > -1>>
 	<<link "Chastity belt">>
 		<<set $activeSlave.chastityVagina = 1,$activeSlave.choosesOwnChastity = 0>>
-		<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
+		<<replace "#vaginalAccessory">>$activeSlave.chastityVagina<</replace>>
 		<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
 		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
 	<</link>>
@@ -1083,15 +1083,15 @@ Chastity device:
 <<if $activeSlave.dick > 0>>
 	<<link "Chastity cage">>
 		<<set $activeSlave.chastityPenis = 1,$activeSlave.choosesOwnChastity = 0>>
-		<<replace "#dickAccessory">>$activeSlave.dickAccessory<</replace>>
+		<<replace "#dickAccessory">>$activeSlave.chastityPenis<</replace>>
 		<<replace "#dickAccessoryDescription">><br>//<<dickAccessoryDescription>>//<</replace>>
 		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
 	<</link>>
 	|
 <</if>>
 <<link "Anal chastity belt">>
-		<<set $activeSlave.chastityAnis = 1,$activeSlave.choosesOwnChastity = 0>>
-		<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
+		<<set $activeSlave.chastityAnus = 1,$activeSlave.choosesOwnChastity = 0>>
+		<<replace "#vaginalAccessory">>$activeSlave.chastityAnus<</replace>>
 		<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
 		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
 <</link>>
@@ -1157,13 +1157,13 @@ Chastity device:
 		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
 	<</link>>
 	| <<link "Anal chastity belt">>
-		<<set $activeSlave.chastityAnis = 1,$activeSlave.choosesOwnChastity = 0>>
+		<<set $activeSlave.chastityAnus = 1,$activeSlave.choosesOwnChastity = 0>>
 		<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
 		<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
 		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
 	<</link>>
 	| <<link "Combined chastity belt">>
-		<<set $activeSlave.vaginalAccessory = "combined chastity",$activeSlave.choosesOwnChastity = 0>>
+		<<set $activeSlave.chastityAnus = 1, $activeSlave.chastityVagina - 1,$activeSlave.choosesOwnChastity = 0>>
 		<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
 		<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
 		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>