diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 8c521dd215681ed3ba6c924597b0f79e87344c7b..17aa56f53050a3604693101354b920040209cdf8 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -150,7 +150,7 @@ You decide to knit up care's raveled sleave with a break in the spa. You have yo
 	You shove $activeSlave.slaveName hard, forcing a surprised shriek out of $him as $he crashes forward into $subSlave.slaveName's <<if $subSlave.boobs > 2000>>helpfully pillowlike bosom<<elseif $subSlave.boobs > 500>>healthy tits<<else>>chest<</if>>, and then ram your pelvis up against $him, pinning $him against $his patient. $subSlave.slaveName's eyelids flicker, but _he2 does not wake up, despite your assault <<if _canUseDick == 1>>shoving $activeSlave.slaveName's cock as far up _his2 asshole as it will go<<else>>trapping $activeSlave.slaveName's hands between them and pushing $his fingers even farther up $subSlave.slaveName's asshole<</if>>. $activeSlave.slaveName tries to shift a little, but receives a peremptory push back to where $he was. $He realizes $he's to lie still and take what's coming to $him, and $he does $his best to relax.
 	<br><br>
 	<<if $PC.dick == 1>>
-		<<if ($activeSlave.vagina > 0) && ($activeSlave.vaginalAccessory != "chastity belt")>>
+		<<if ($activeSlave.vagina > 0) && !($activeSlave.chastityVagina)>>
 		<<if $activeSlave.vagina > 2>>
 			$His roomy cunt takes your brutal thrusting without trouble. To communicate your message, $he needs to be uncomfortable, so you deliberately force $him down farther and fuck $him at an awkward angle. Your harsh pounding begins to force groans out of $him.
 		<<elseif $activeSlave.vagina > 1>>
diff --git a/src/uncategorized/RECI.tw b/src/uncategorized/RECI.tw
index 0f839f2ca3702f51ab572bc13df17dd92a0dde8d..7d9c7112670b6679275943db25dfd37942dc5c1e 100644
--- a/src/uncategorized/RECI.tw
+++ b/src/uncategorized/RECI.tw
@@ -190,7 +190,7 @@ $He arches $his back and bats $his eyes at you. "A lot."
 <<elseif ($activeSlave.dick > 0)>>
 	$his pathetically limp dick is practically dripping precum.
 <<elseif ($activeSlave.clit > 0)>>$his clit is big enough to be visibly erect when $he's willing and ready<<else>>a sheen is visible on $his pussylips, and $he's smiling hopefully at you<</if>>. Your inspections require the slave to offer each of $his body parts to your view, and when the routine reaches $his crotch, $he obediently backs up to sit down on the couch, spread $his legs, and display $his
-<<if ($activeSlave.dick > 0) && ($activeSlave.dickAccessory == "chastity" || $activeSlave.dickAccessory == "combined chastity")>>
+<<if ($activeSlave.dick > 0) && ($activeSlave.chastityPenis)>>
 	chastity caged dick.
 <<elseif canAchieveErection($activeSlave)>>
 	erect cock, which $he doesn't have to touch to keep upright.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index d75d968817f64889eb32f0c24f023caf5a6644be..310a6ea250fab4e8bbe235017854b5364ded5070 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -13087,7 +13087,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 <br><<link "Force $him to degrade $himself">>
 	<<EventNameDelink $activeSlave>>
 	<<replace "#result">>
-	Suction cup dildos are terribly useful. You place a moderate-sized one on a low table in your office<<if ["combined chastity", "anal chastity"].includes($activeSlave.vaginalAccessory) || ["combined chastity", "anal chastity"].includes($activeSlave.dickAccessory)>>, unlock $his chastity belt<</if>>, and order $him to squat down on it and fuck $his own asshole. $He hesitates, incredulous, and finds $himself bound to the couch and thoroughly whipped. It isn't a sexual whipping, either, but a methodical and scientific administration of pain right up to the border of damage. When $he's been reduced to a state of abject, sobbing surrender, you free $him and repeat your orders as though nothing had happened. Still crying, $he hobbles over and up onto the table,
+	Suction cup dildos are terribly useful. You place a moderate-sized one on a low table in your office<<if ($activeSlave.chastityAnus)>>, unlock $his chastity belt<</if>>, and order $him to squat down on it and fuck $his own asshole. $He hesitates, incredulous, and finds $himself bound to the couch and thoroughly whipped. It isn't a sexual whipping, either, but a methodical and scientific administration of pain right up to the border of damage. When $he's been reduced to a state of abject, sobbing surrender, you free $him and repeat your orders as though nothing had happened. Still crying, $he hobbles over and up onto the table,
 	<<if $activeSlave.belly >= 300000 || $activeSlave.weight > 190>>
 		struggles to line $himself up, and finds it slammed into $his asshole when the table gives out under $his<<if $activeSlave.belly >= 300000>> gravid<</if>> weight. You leave $him there to struggle with the dildo wedged in $his rear until $he finally manages to pop it free from the table fragment stuck under mass and roll over. You haul $him onto
 	<<else>>
@@ -13110,7 +13110,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address
 	<<else>>
 		$He begs, "Plea<<s>>e no, <<Master>>, plea<<s>>e don't rape me in my a<<ss>>, <<Master>>!"
 	<</if>>
-	You make a show of considering, and then tell $him you know a way $he can continue being an anal virgin — for now. You want a new hole to play with, and $he has two untouched holes. $He gasps when $he realizes what you want. $He hesitates to answer, uncertain of which $he values more, and finds $himself bound to the couch<<if ["combined chastity", "anal chastity"].includes($activeSlave.vaginalAccessory) || ["combined chastity", "anal chastity"].includes($activeSlave.dickAccessory)>>, stripped of $his chastity,<</if>> and thoroughly whipped. It isn't a sexual whipping, either, but a methodical and scientific administration of pain right up to the border of damage. When $he's been reduced to a state of abject, sobbing surrender, you free $him and repeat your orders as though nothing had happened. Still crying, $he prostrates $himself and
+	You make a show of considering, and then tell $him you know a way $he can continue being an anal virgin — for now. You want a new hole to play with, and $he has two untouched holes. $He gasps when $he realizes what you want. $He hesitates to answer, uncertain of which $he values more, and finds $himself bound to the couch<<if ($activeSlave.chastityAnus)>>, stripped of $his chastity,<</if>> and thoroughly whipped. It isn't a sexual whipping, either, but a methodical and scientific administration of pain right up to the border of damage. When $he's been reduced to a state of abject, sobbing surrender, you free $him and repeat your orders as though nothing had happened. Still crying, $he prostrates $himself and
 	<<if $activeSlave.trust < 20>>
 		spreads $his butt for you.
 	<<else>>
diff --git a/src/uncategorized/useGuard.tw b/src/uncategorized/useGuard.tw
index 05a390a9154ce72c7256393e90493c8c8a60b4dc..fe475f92f1ba441f593064da0f5e0b6480afaa1c 100644
--- a/src/uncategorized/useGuard.tw
+++ b/src/uncategorized/useGuard.tw
@@ -146,7 +146,7 @@ $slaves[$i].slaveName is standing behind your left shoulder, guarding your perso
 <<case "a sweater and panties" "a t-shirt" "a tank-top and panties" "a t-shirt and thong" "an oversized t-shirt and boyshorts" "an oversized t-shirt" "a t-shirt and jeans" "boyshorts" "cutoffs" "leather pants and pasties" "leather pants" "panties" "sport shorts and a t-shirt" "a t-shirt and panties" "panties and pasties" "striped underwear" "sport shorts and a sports bra" "jeans" "a sweater and cutoffs" "leather pants and a tube top" "sport shorts">>
 	$His weapons only accentuate the nakedness of $his body.
 <<default>>
-	<<if ($activeSlave.chastityVagina)>>
+	<<if ($activeSlave.chastityVagina) || ($activeSlave.chastityAnus)>>
 		$His chastity belt covers and protects $him, just as $his weapons cover and protect you.
 	<<elseif ($activeSlave.chastityPenis)>>
 		$His chastity cage covers and protects $him, just as $his weapons cover and protect you.
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 9e42a3f3b4ff96dee3dd1906ef7fecd686c54da9..4b816bf9a1de8e26423054de5487bc0c5421b739 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -277,7 +277,7 @@
 	<<elseif ($activeSlave.dick > 1) && canPenetrate($activeSlave) && (_partnerSlave.amp != 1) && ($activeSlave.amp != 1)>>
 		<<if $activeSlave.livingRules == "luxurious">>in bed in the nice little room they share,<<else>>out in the open on $activeSlave.slaveName's bedroll in the slave dormitory,<</if>> spooning while $activeSlave.slaveName gently rubs $his cock between _partnerSlave.slaveName's thighs, pressed tightly together. Since _partnerSlave.slaveName is a virgin, this is the closest they can come to penetrative intercourse, but $activeSlave.slaveName is enjoying _partnerSlave.slaveName's body anyway, and is doing $his best to ensure $his _activeSlaveRel enjoys $himself. $He's nibbling $his _activeSlaveRel's ears and neck, cupping a breast with one hand, and lightly stimulating _him2 with the other.
 		<<set $activeSlave.penetrativeCount++, $penetrativeTotal++>>
-	<<elseif ($activeSlave.clit > 2) && ($activeSlave.vaginalAccessory != "chastity belt") && (_partnerSlave.amp != 1) && ($activeSlave.amp != 1)>>
+	<<elseif ($activeSlave.clit > 2) && !($activeSlave.chastityVagina) && (_partnerSlave.amp != 1) && ($activeSlave.amp != 1)>>
 		<<if $activeSlave.livingRules == "luxurious">>in the nice little room they share,<<else>>out in the open in the slave dormitory,<</if>> with _partnerSlave.slaveName down on $his knees in front of $activeSlave.slaveName. From behind _partnerSlave.slaveName it looks like $he's giving $his _activeSlaveRel a conventional, if enthusiastic, blowjob. Only on closer inspection does it become clear how unusual the oral is: $activeSlave.slaveName has such a huge clit that $his _activeSlaveRel can suck $him off just like it were a penis.
 		<<set _partnerSlave.oralCount++, $activeSlave.penetrativeCount++, $oralTotal++, $penetrativeTotal++>>
 	<<elseif (_partnerSlave.vagina > 0) && canDoVaginal(_partnerSlave) && (_partnerSlave.amp != 1) && ($activeSlave.amp != 1)>>
diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw
index 6c25aaff07ad92c41ead9f7393b51c251a8ddb1f..cbcd168e01e4bd272d4af4625dfafa913cd6b63d 100644
--- a/src/utility/descriptionWidgetsFlesh.tw
+++ b/src/utility/descriptionWidgetsFlesh.tw
@@ -3575,10 +3575,10 @@ $He's got a
 			The strip of cloth running down $his front
 			<<if ($activeSlave.dick > 0) && canAchieveErection($activeSlave)>>
 				splits well above the base of $his dick, allowing $his erection to stand out proudly.
-			<<elseif ($activeSlave.vagina < 0) || ($activeSlave.vaginalAccessory == "chastity belt")>>
-				has the new religion's symbol for anal sex embossed on it in gold, implying that this holy sex slave should be approached from the rear.
-			<<elseif ($activeSlave.vaginalAccessory == "combined chastity")>>
+			<<elseif ($activeSlave.chastityVagina) && ($activeSlave.chastityAnus)>>
 				has the new religion's symbol for chastity embossed on it in gold, implying that this holy sex slave should only be used for oral.
+			<<elseif ($activeSlave.vagina < 0) || ($activeSlave.chastityVagina)>>
+				has the new religion's symbol for anal sex embossed on it in gold, implying that this holy sex slave should be approached from the rear.
 			<<elseif ($activeSlave.chastityAnus) && canDoVaginal($activeSlave)>>
 				has the new religion's symbol for anal chastity embossed on it in gold, implying that this holy sex slave should be used for vaginal sex or oral sex only.
 			<<elseif $activeSlave.vagina == -1>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 4be036fd0c96805bb69f1c5af327d4830c90d307..1f51d3d0ed227781ba5f50a3dc9f3c8e9d808cef 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -5751,12 +5751,13 @@ $His
 <</widget>>
 
 <<widget "vaginalAccessoryDescription">>
-<<switch $activeSlave.vaginalAccessory>>
-<<case "chastity belt" "combined chastity">>
+<<if $activeSlave.chastityVagina>>
 	$His pussy is protected by a chastity belt<<if $activeSlave.clothes != "no clothing">> worn under $his clothing<</if>>.
 	<<if $arcologies[0].FSRestart != "unset">>
-	This pleases the Societal Elite.
+		This pleases the Societal Elite.
 	<</if>>
+<</if>>
+<<switch $activeSlave.vaginalAccessory>>
 <<case "dildo">>
 	$His pussy is filled by a dildo held in place by a strap, which $he can remove for vaginal intercourse.
 <<case "long dildo">>