diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt
index ea2797028567d9dd39c01d3dec7b640e53e161c7..477a44f14ee1bf6953d39b5505fe0d972ad7dddb 100644
--- a/slave variables documentation - Pregmod.txt	
+++ b/slave variables documentation - Pregmod.txt	
@@ -2636,6 +2636,7 @@ vaginalAccessory:
 
 may accept strings, use at own risk
 "none"
+"bullet vibrator"
 "dildo"
 "large dildo"
 "huge dildo"
@@ -2647,8 +2648,7 @@ vaginalAttachment:
 
 may accept strings, use at own risk
 "none"
-"vibrating dildo"
-"bullet vibrator"
+"vibrator"
 
 dickAccessory:
 
diff --git a/src/art/vector/VectorArtJS.js b/src/art/vector/VectorArtJS.js
index 58f9d327a7f56c2ca972585530ded72bb4b462d6..d14c76eaf58739fff1aae73fbda440e175ca5756 100644
--- a/src/art/vector/VectorArtJS.js
+++ b/src/art/vector/VectorArtJS.js
@@ -1016,7 +1016,7 @@ window.VectorArt = (function () {
 				case "slutty jewelry":
 				case "striped underwear":
 				case "uncomfortable straps":
-					if (slave.vaginalAccessory === "dildo" || slave.vaginalAttachment === "vibrating dildo") {
+					if (slave.vaginalAccessory === "dildo" || slave.vaginalAttachment === "vibrator") {
 						r += jsInclude("Art_Vector_Dildo_Short");
 					} else if (slave.vaginalAccessory === "long dildo") {
 						r += jsInclude("Art_Vector_Dildo_Long");
@@ -1029,7 +1029,7 @@ window.VectorArt = (function () {
 							r += jsInclude("Art_Vector_Dildo_Huge");
 						else if (slave.vaginalAccessory === "long, huge dildo")
 							r += jsInclude("Art_Vector_Dildo_Huge_Long");
-					} else if (slave.vaginalAttachment === "bullet vibrator") {
+					} else if (slave.vaginalAccessory === "bullet vibrator") {
 						r += jsInclude("Art_Vector_Bullet_Vibrator");
 					}
 			}
diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw
index 7ec819c906f2be2f20d3d2516d703f484a8916ff..7645c3af06e676e6658cb1e3009ca2b9083c9775 100644
--- a/src/init/setupVars.tw
+++ b/src/init/setupVars.tw
@@ -2072,6 +2072,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
 <<set setup.vaginalAccessories = [
 	{name: "No default setting", value: "no default setting"},
 	{name: "None", value: "none"},
+	{name: "Bullet vibrator", value: "bullet vibrator"},
 	{name: "Dildo", value: "dildo"},
 	{name: "Long dildo", value: "long dildo", rs: "buyBigDildos"},
 	{name: "Large dildo", value: "large dildo"},
@@ -2082,8 +2083,7 @@ Then pick _namePool.random(), or display those names as possible choices, or do
 <<set setup.vaginalAttachments = [
 	{name: "No default setting", value: "no default setting"},
 	{name: "None", value: "none"},
-	{name: "Bullet vibrator", value: "bullet vibrator"},
-	{name: "Vibrating dildo", value: "vibrating dildo"}]>>
+	{name: "Vibrating attachment", value: "vibrator"}]>>
 
 <<set setup.dickAccessories = [
 	{name: "No default setting", value: "no default setting"},
diff --git a/src/js/DefaultRules.js b/src/js/DefaultRules.js
index c2ad56a7aefe6eab44ca03a65929f0b2181a689d..93a753a0dcebad488906df341f00aa3053cc63bc 100644
--- a/src/js/DefaultRules.js
+++ b/src/js/DefaultRules.js
@@ -743,7 +743,7 @@ window.DefaultRules = (function() {
 	/** @param {App.Entity.SlaveState} slave */
 	function ProcessVaginalAttachments(slave, rule) {
 		// apply vaginal accessories to slaves
-		if (slave.vaginalAccessory === "none" && slave.vaginalAttachment === "vibrating dildo") {
+		if (slave.vaginalAccessory === "none" && slave.vaginalAttachment === "vibrator") {
 			slave.vaginalAttachment = "none"; // clears dildo attachment when dildos are removed above
 		} else if ((rule.vaginalAttachment !== undefined) && (rule.vaginalAttachment !== "no default setting")) {
 			if ((slave.vaginalAttachment !== rule.vaginalAttachment)) {
@@ -755,7 +755,7 @@ window.DefaultRules = (function() {
 							r += `<br>${slave.slaveName} has been instructed not to use an attachment for ${his} dildo.`;
 							break;
 						
-						case "vibrating dildo":
+						case "vibrator":
 							r += `<br>${slave.slaveName}'s dildo has been replaced with a vibrating model.`;
 							break;
 
diff --git a/src/js/SlaveState.js b/src/js/SlaveState.js
index e4929bb238099a129d0a0c119142b6394cd372ec..4bcb55d3cf9b4ae203c1a4ef6dd5013ac3166d59 100644
--- a/src/js/SlaveState.js
+++ b/src/js/SlaveState.js
@@ -1554,13 +1554,19 @@ App.Entity.SlaveState = class SlaveState {
 		/**
 		 * may accept strings, use at own risk
 		 * * "none"
+		 * * "bullet vibrator"
+		 * * "dildo"
+		 * * "long dildo"
+		 * * "large dildo"
+		 * * "long, large dildo"
+		 * * "huge dildo"
+		 * * "long, huge dildo"
 		 */
 		this.vaginalAttachment = "none";
 		/**
 		 * may accept strings, use at own risk
 		 * * "none"
-		 * * "bullet vibrator"
-		 * * "vibrating dildo"
+		 * * "vibrator"
 		 */
 		this.dickAccessory = "none";
 		/**
diff --git a/src/js/itemAvailability.js b/src/js/itemAvailability.js
index 288cff46e5e3fcb3df8b0c34f0af73ac8ab5812a..eeac0fb007d7a35cf66753a39943814cfb1eb814 100644
--- a/src/js/itemAvailability.js
+++ b/src/js/itemAvailability.js
@@ -134,13 +134,12 @@ window.isItemAccessible = function(string) {
 		case 'a large empathy belly':
 		case 'a huge empathy belly':
 			return (V.arcologies[0].FSRepopulationFocus > 0 || V.clothesBoughtBelly === 1);
+		case 'bullet vibrator':	// Not technically a dildo, but $toyBoughtVaginalAccessories doesn't exist
 		case 'long dildo':
 		case 'long, large dildo':
 		case 'long, huge dildo':
 			return (V.toysBoughtDildos === 1);
 		case 'vibrator':
-		case 'bullet vibrator':
-		case 'vibrating dildo':
 			return (V.toysBoughtVaginalAttachments === 1);
 		case 'long plug':
 		case 'long, large plug':
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 3cd3139ab68b60d02605c5a1039871c84e57672f..a9cc60634875e403f1d3bcb8dc83cc09527c6ec2 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -4622,8 +4622,11 @@ window.SlaveSummaryUncached = (function(){
 
 	/** @param {App.Entity.SlaveState} slave */
 	function long_vaginal_acc(slave) {
-		if (slave.vaginalAttachment !== "vibrating dildo") {
+		if (slave.vaginalAttachment !== "vibrator") {
 			switch (slave.vaginalAccessory) {
+				case "bullet vibrator":
+					r += `Attached bullet vibrator.`;
+					break;
 				case "dildo":
 					r += `Vaginal dildo.`;
 					break;
@@ -4647,12 +4650,9 @@ window.SlaveSummaryUncached = (function(){
 		r += " ";
 		if (slave.vaginalAttachment !== "none") {
 			switch (slave.vaginalAttachment) {
-				case "bullet vibrator":
-				r += `Attached bullet vibrator.`;
-				break;
-				case "vibrating dildo":
-				r += `Vibrating dildo.`;
-				break;
+				case "vibrator":
+					r += `Vibrating dildo.`;
+					break;
 			}
 			r += " ";
 		}
diff --git a/src/pregmod/saClothes.tw b/src/pregmod/saClothes.tw
index 8fe8b4d034c6926299ad549a02ce1ff6c1bd8af7..e2caab61e098eed72e7cc9d6dd14d4aaab0b462b 100644
--- a/src/pregmod/saClothes.tw
+++ b/src/pregmod/saClothes.tw
@@ -639,7 +639,9 @@
 <</if>>
 
 <<if ($slaves[$i].vaginalAccessory != "none")>>
-	<<if ($slaves[$i].vaginalAccessory == "dildo")>>
+	<<if ($slaves[$i].vaginalAttachment == "bullet vibrator")>>
+		/* TODO: add effects here */
+	<<elseif ($slaves[$i].vaginalAccessory == "dildo")>>
 		<<if ($slaves[$i].vagina < 1) && (random(1,100) > 50)>>
 			Constantly wearing a dildo in $his virgin pussy @@.lime;gets it used to penetration.@@
 			<<set $slaves[$i].vagina += 1>>
@@ -822,8 +824,7 @@
 <</if>>
 <<if ($slaves[$i].vaginalAttachment != "none")>>
 	/* TODO: write effects here */
-	<<if ($slaves[$i].vaginalAttachment == "bullet vibrator")>>
-	<<elseif ($slaves[$i].vaginalAttachment == "vibrating dildo")>>
+	<<elseif ($slaves[$i].vaginalAttachment == "vibrator")>>
 	<</if>>
 <</if>>
 
diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw
index cfdd3d894a7d4399efd2ff7301508fef4558c28c..24d79cb0092b7518df1b2eb12ec61b299f3cade5 100644
--- a/src/uncategorized/saLongTermEffects.tw
+++ b/src/uncategorized/saLongTermEffects.tw
@@ -1605,7 +1605,7 @@
 		<<switch $slaves[$i].clitSetting>>
 		<<case "none">>
 			$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-			<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+			<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 				and the bullet vibrator $he is wearing disrupt arousal, @@.red;reducing $his sex drive@@ and @@.mediumorchid;infuriating $him.@@
 				<<set $slaves[$i].devotion -= 3>>
 				<<if $slaves[$i].energy > 5>>
@@ -1613,7 +1613,7 @@
 				<<elseif $slaves[$i].energy > 0>>
 					<<set $slaves[$i].energy = 0>>
 				<</if>>
-			<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+			<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 				and the vibrating dildo in $his pussy disrupt arousal, @@.red;reducing $his sex drive@@ and @@.mediumorchid;infuriating $him.@@
 				<<set $slaves[$i].devotion -= 3>>
 				<<if $slaves[$i].energy > 5>>
@@ -1633,10 +1633,10 @@
 		<<case "all">>
 			<<if $slaves[$i].energy <= 95>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing encourage sex of all kinds, @@.green;increasing $his sex drive.@@
 					<<set $slaves[$i].energy += 5>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy encourage sex of all kinds, @@.green;increasing $his sex drive.@@
 					<<set $slaves[$i].energy += 5>>
 				<<else>>
@@ -1647,14 +1647,14 @@
 		<<case "women">>
 			<<if $slaves[$i].attrXX < 95>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing successfully @@.green;increase $his attraction to girls@@ by pleasuring $him when $he's around them.
 					<<set $slaves[$i].attrXX += 6+$assistant+$assistant>>
 					<<if $slaves[$i].energy < 80>>
 						This has the secondary effect of slightly @@.green;enhancing $his libido.@@
 						<<set $slaves[$i].energy += 2>>
 					<</if>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy successfully @@.green;increase $his attraction to girls@@ by pleasuring $him when $he's around them.
 					<<set $slaves[$i].attrXX += 6+$assistant+$assistant>>
 					<<if $slaves[$i].energy < 80>>
@@ -1673,14 +1673,14 @@
 		<<case "anti-women">>
 			<<if $slaves[$i].attrXX > 0>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing successfully @@.green;suppress $his attraction to girls@@ by making $his private parts very uncomfortable when $he's around them.
 					<<set $slaves[$i].attrXX -= Math.clamp($slaves[$i].attrXX-(6+$assistant+$assistant),0,100)>>
 					<<if $slaves[$i].energy > 0>>
 						This has the secondary effect of slightly @@.red;reducing $his libido.@@
 						<<set $slaves[$i].energy -= 2>>
 					<</if>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy successfully @@.green;suppress $his attraction to girls@@ by making $his private parts very uncomfortable when $he's around them.
 					<<set $slaves[$i].attrXX -= Math.clamp($slaves[$i].attrXX-(6+$assistant+$assistant),0,100)>>
 					<<if $slaves[$i].energy > 0>>
@@ -1699,14 +1699,14 @@
 		<<case "men">>
 			<<if $slaves[$i].attrXY < 95>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing successfully @@.green;increase $his attraction to guys@@ by pleasuring $him when $he's around cocks.
 					<<set $slaves[$i].attrXY += 6+$assistant+$assistant>>
 					<<if $slaves[$i].energy < 80>>
 						This has the secondary effect of slightly @@.green;enhancing $his libido.@@
 						<<set $slaves[$i].energy += 2>>
 					<</if>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy successfully @@.green;increase $his attraction to guys@@ by pleasuring $him when $he's around cocks.
 					<<set $slaves[$i].attrXY += 6+$assistant+$assistant>>
 					<<if $slaves[$i].energy < 80>>
@@ -1725,14 +1725,14 @@
 		<<case "anti-men">>
 			<<if $slaves[$i].attrXY > 0>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing successfully @@.green;suppress $his attraction to guys@@ by making $his private parts very uncomfortable when $he's around them.
 					<<set $slaves[$i].attrXY -= Math.clamp($slaves[$i].attrXY-(6+$assistant+$assistant),0,100)>>
 					<<if $slaves[$i].energy > 0>>
 						This has the secondary effect of slightly @@.red;reducing $his libido.@@
 						<<set $slaves[$i].energy -= 2>>
 					<</if>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy successfully @@.green;suppress $his attraction to guys@@ by making $his private parts very uncomfortable when $he's around them.
 					<<set $slaves[$i].attrXY -= Math.clamp($slaves[$i].attrXY-(6+$assistant+$assistant),0,100)>>
 					<<if $slaves[$i].energy > 0>>
@@ -1751,10 +1751,10 @@
 		<<case "vanilla">>
 			<<if ($slaves[$i].fetish != "none") && (_fetishChangeChance > random(0,100)-20*$assistant)>>
 				After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing encourage many orgasms during straightforward sex, @@.coral;$his sexuality returns to normal.@@
 					<<set $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy encourage many orgasms during straightforward sex, @@.coral;$his sexuality returns to normal.@@
 					<<set $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 				<<else>>
@@ -1766,10 +1766,10 @@
 			<<if ($slaves[$i].fetish != "cumslut")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's using $his mouth.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's using $his mouth.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -1778,10 +1778,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms as $he performs oral sex, @@.lightcoral;$he develops a fetish for cum.@@
 						<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms as $he performs oral sex, @@.lightcoral;$he develops a fetish for cum.@@
 						<<set $slaves[$i].fetish = "cumslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -1791,10 +1791,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his oral fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his oral fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -1806,10 +1806,10 @@
 			<<if ($slaves[$i].fetish != "buttslut")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $his rear hole is being fucked.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $his rear hole is being fucked.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -1818,10 +1818,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms when $his ass is being stimulated, @@.lightcoral;$he develops a fetish for being an anal bottom.@@
 						<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms when $his ass is being stimulated, @@.lightcoral;$he develops a fetish for being an anal bottom.@@
 						<<set $slaves[$i].fetish = "buttslut", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -1831,10 +1831,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his anal fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his anal fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -1846,10 +1846,10 @@
 			<<if ($slaves[$i].fetish != "boobs")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> 
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $his tits are being touched.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $his tits are being touched.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -1858,10 +1858,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms when $his nipples are being stimulated, @@.lightcoral;$he develops a fetish for $his tits.@@
 						<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms when $his nipples are being stimulated, @@.lightcoral;$he develops a fetish for $his tits.@@
 						<<set $slaves[$i].fetish = "boobs", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -1871,10 +1871,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his boob fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his boob fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -1886,10 +1886,10 @@
 			<<if ($slaves[$i].fetish != "submissive")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's being held down and used.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's being held down and used.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -1898,10 +1898,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms when $he is restrained, @@.lightcoral;$he develops a fetish for submission.@@
 						<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms when $he is restrained, @@.lightcoral;$he develops a fetish for submission.@@
 						<<set $slaves[$i].fetish = "submissive", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -1911,10 +1911,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his submission.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his submission.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -1926,10 +1926,10 @@
 			<<if ($slaves[$i].fetish != "humiliation")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's got an audience.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's got an audience.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -1938,10 +1938,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms when $he is being humiliated, @@.lightcoral;$he develops a fetish for humiliation.@@
 						<<set $slaves[$i].fetish = "humiliation", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms when $he is being humiliated, @@.lightcoral;$he develops a fetish for humiliation.@@
 						<<set $slaves[$i].fetish = "humiliation", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -1951,10 +1951,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his humiliation fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his humiliation fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -1966,10 +1966,10 @@
 			<<if ($slaves[$i].fetish != "pregnancy")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he feels like $he's being bred.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he feels like $he's being bred.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -1978,10 +1978,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms during <<if $PC.dick == 1>>unprotected sex<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
 						<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms during <<if $PC.dick == 1>>unprotected sex<<if $PC.vagina == 1>> and <</if>><</if>><<if $PC.vagina == 1>>loving contact with the female anatomy<</if>>, @@.lightcoral;$he begins to fantasize about pregnancy.@@
 						<<set $slaves[$i].fetish = "pregnancy", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -1991,10 +1991,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his pregnancy fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his pregnancy fetish.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -2006,10 +2006,10 @@
 			<<if ($slaves[$i].fetish != "dom")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when another slave is servicing $him.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when another slave is servicing $him.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -2018,10 +2018,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms while $he's taking an active, dominant sexual role, @@.lightcoral;$he begins to enjoy dominance.@@
 						<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms while $he's taking an active, dominant sexual role, @@.lightcoral;$he begins to enjoy dominance.@@
 						<<set $slaves[$i].fetish = "dom", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -2031,10 +2031,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his dominance.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his dominance.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -2046,10 +2046,10 @@
 			<<if ($slaves[$i].fetish != "masochist")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's being hurt.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he's being hurt.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -2058,10 +2058,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms while $he's being beaten, @@.lightcoral;$he begins to enjoy pain.@@
 						<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms while $he's being beaten, @@.lightcoral;$he begins to enjoy pain.@@
 						<<set $slaves[$i].fetish = "masochist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -2071,10 +2071,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his masochism.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his masochism.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
@@ -2086,10 +2086,10 @@
 			<<if ($slaves[$i].fetish != "sadist")>>
 				<<if $slaves[$i].fetishStrength >= 10>>
 					$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>>
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he witnesses or even takes part in another slave's pain.
 						<<set $slaves[$i].fetishStrength -= 30>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy act to @@.coral;suppress $his current fetish,@@ encouraging $him to orgasm when $he witnesses or even takes part in another slave's pain.
 						<<set $slaves[$i].fetishStrength -= 30>>
 					<<else>>
@@ -2098,10 +2098,10 @@
 					<</if>>
 				<<elseif (_fetishChangeChance > random(0,100)-20*$assistant)>>
 					After $his smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-					<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+					<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 						and the bullet vibrator $he is wearing encourage many orgasms while $he's involved in the abuse of other slaves, @@.lightcoral;$he begins to develop a sadistic streak.@@
 						<<set $slaves[$i].fetish = "sadist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
-					<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+					<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 						and the vibrating dildo in $his pussy encourage many orgasms while $he's involved in the abuse of other slaves, @@.lightcoral;$he begins to develop a sadistic streak.@@
 						<<set $slaves[$i].fetish = "sadist", $slaves[$i].fetishKnown = 1, $slaves[$i].fetishStrength = 15>>
 					<<else>>
@@ -2111,10 +2111,10 @@
 				<</if>>
 			<<elseif ($slaves[$i].fetishStrength <= 95)>>
 				$His smart <<if $slaves[$i].vagina > -1>>clit<<else>>frenulum<</if>> piercing
-				<<if $slaves[$i].vaginalAttachment == "bullet vibrator">>
+				<<if $slaves[$i].vaginalAccessory == "bullet vibrator">>
 					and the bullet vibrator $he is wearing @@.lightcoral;advance $his sadism.@@
 					<<set $slaves[$i].fetishStrength += 6>>
-				<<elseif $slaves[$i].vaginalAttachment == "vibrating dildo">>
+				<<elseif $slaves[$i].vaginalAttachment == "vibrator">>
 					and the vibrating dildo in $his pussy @@.lightcoral;advance $his sadism.@@
 					<<set $slaves[$i].fetishStrength += 6>>
 				<<else>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index 0a5065d02799ebd8d7058e646cc997bf8483b0bd..c8188ed638afc4b689055172f2dc592672581de2 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -1055,6 +1055,7 @@
 	<<if $activeSlave.vagina > -1>>
 		<br>Vaginal accessory: ''<span id="vaginalAccessory">$activeSlave.vaginalAccessory</span>.''
 		<<link "None">><<set $activeSlave.vaginalAccessory = "none">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><<SlaveInteractImpreg>><<SlaveInteractFertility>><<SlaveInteractSexOption>><<SlaveInteractAnalSexOption>><<SlaveInteractGropeOption>><<SlaveInteractDickGropeOption>><<SlaveInteractAnalGropeOption>><</link>>
+		| <<link "Bullet vibrator">><<set $activeSlave.vaginalAccessory = "bullet vibrator">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
 		| <<link "Dildo">><<set $activeSlave.vaginalAccessory = "dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
 		<<if isItemAccessible("long dildo") && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>>
 			| <<link "Long dildo">><<set $activeSlave.vaginalAccessory = "long dildo">><<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>><</link>>
@@ -1079,8 +1080,7 @@
 			''<span id="vaginalAttachment">$activeSlave.vaginalAttachment</span>.''
 			<<link "None">><<set $activeSlave.vaginalAttachment = "none">><<replace "#vaginalAttachment">>$activeSlave.vaginalAttachment<</replace>><</link>>
 			<<if $toysBoughtVaginalAttachments == 1>>
-				| <<link "Bullet vibrator">><<set $activeSlave.vaginalAttachment = "bullet vibrator">><<replace "#vaginalAttachment">>$activeSlave.vaginalAttachment<</replace>><</link>>
-				| <<link "Vibrating dildo">><<set $activeSlave.vaginalAttachment = "vibrating dildo">><<replace "#vaginalAttachment">>$activeSlave.vaginalAttachment<</replace>><</link>>
+				| <<link "Vibrating dildo">><<set $activeSlave.vaginalAttachment = "vibrator">><<replace "#vaginalAttachment">>$activeSlave.vaginalAttachment<</replace>><</link>>
 			<</if>>
 		<</if>>
 	<</if>>
diff --git a/src/uncategorized/wardrobe.tw b/src/uncategorized/wardrobe.tw
index 80c2c5509a98c0688fd2c6e2a2c96c3ca137a9e4..71f666c603b1092a0187e650d936867d766ae003 100644
--- a/src/uncategorized/wardrobe.tw
+++ b/src/uncategorized/wardrobe.tw
@@ -276,8 +276,8 @@ The room containing all the clothes and accessories you have available to dress
 <</if>>
 
 <br>
-<<if $toysBoughtVaginalAttachments == 0>>
-	[[Order a shipment of bullet vibes and vibrating dildos|Wardrobe][cashX(-10000, "capEx"), $toysBoughtVaginalAttachments = 1]]
+<<if $toysBoughtVaginalAccessories == 0>>
+	[[Order a shipment of bullet vibes and vibrating dildos|Wardrobe][cashX(-10000, "capEx"), $toysBoughtVaginalAccessories = 1]]
 	//Costs <<print cashFormat(10000)>>//
 <<else>>
 	You are well stocked with bullet vibrators and vibrating dildos.
diff --git a/src/uncategorized/wardrobeUse.tw b/src/uncategorized/wardrobeUse.tw
index 9c80704b911b5795cd515dc1d23141ab431ba8e2..5ebd2fe8eda8e94d2c1d6e21a95c22211e1134ec 100644
--- a/src/uncategorized/wardrobeUse.tw
+++ b/src/uncategorized/wardrobeUse.tw
@@ -1103,6 +1103,12 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
 		<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
 		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
 	<</link>>
+	| <<link "Bullet vibrator">>
+		<<set $activeSlave.vaginalAccessory = "bullet vibrator">>
+		<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
+		<<replace "#vaginalAccessoryDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
+		<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
+	<</link>>
 	| <<link "Dildo">>
 		<<set $activeSlave.vaginalAccessory = "dildo">>
 		<<replace "#vaginalAccessory">>$activeSlave.vaginalAccessory<</replace>>
@@ -1163,14 +1169,8 @@ Clothes: ''<span id="clothes">$activeSlave.clothes</span>.''
 			<<replace "#vaginalAttachmentDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
 			<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>	/* TODO: don't actually know if I need this - what is this for? */
 		<</link>>
-		| <<link "Bullet vibrator">>
-			<<set $activeSlave.vaginalAttachment = "bullet vibrator">>
-			<<replace "#vaginalAttachment">>$activeSlave.vaginalAttachment<</replace>>
-			<<replace "#vaginalAttachmentDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
-			<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
-		<</link>>
 		| <<link "Vibrating dildo">>
-			<<set $activeSlave.vaginalAttachment = "vibrating dildo">>
+			<<set $activeSlave.vaginalAttachment = "vibrator">>
 			<<replace "#vaginalAttachment">>$activeSlave.vaginalAttachment<</replace>>
 			<<replace "#vaginalAttachmentDescription">>//<<vaginalAccessoryDescription>>//<</replace>>
 			<<replace "#buttplugDescription">>//<<buttplugDescription>>//<</replace>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index 11a032f76fc2f18bda6048353895b173ae3d84a2..3e1ba30373806b64e9bad71a994fd6c76e7c572c 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -5881,7 +5881,10 @@ $His
 	<</if>>
 <</if>>
 <<switch $activeSlave.vaginalAccessory>>
+<<case "bullet vibrator">>
+	/* TODO: write a description */
 <<case "dildo">>
+	/* TODO: these may need to be updated for slaves with gaping+ vaginas */
 	$His pussy is filled by a dildo held in place by a strap, which $he can remove for vaginal intercourse.
 <<case "long dildo">>
 	$His pussy is filled by a very long dildo held in place by a strap, which $he can remove for vaginal intercourse. It noticeably bulges $his stomach.
@@ -5916,9 +5919,10 @@ $His
 
 <<widget "vaginalAttachmentDescription">>
 <<switch $activeSlave.vaginalAttachment>>
-	/* TODO: write descriptions here */
-<<case "bullet vibrator">>
-<<case "vibrating dildo">>
+	/* TODO: not sure about this description */
+	$His pussy is filled with a vibrating dildo held in place by a strap, which $he can remove for for vaginal intercourse. $He looks distinctly uncomfortable as it buzzes every so often.
+	/* TODO: add descriptions for slaves with gaping+ vaginas */
+<<case "vibrator">>
 <</switch>>
 <</widget>>