diff --git a/src/npc/descriptions/butt/buttplug.js b/src/npc/descriptions/butt/buttplug.js
index 60cce3a04e49b66c3b4017cbff72351a34d8a6bb..f1f570b0c33f8e906099bf3f5cc5a05e5f777119 100644
--- a/src/npc/descriptions/butt/buttplug.js
+++ b/src/npc/descriptions/butt/buttplug.js
@@ -613,25 +613,25 @@ App.Desc.buttplug = function(slave, { market, eventDescription } = {}) {
 		}
 	}
 	const buttplug = App.Data.buttplugs.get(slave.buttplug) || V.customItem.buttPlugs.get(slave.buttplug);
-	switch (slave.buttplug) {
-		case "plug":
-			r.push(`It's filled by a standard`);
+	if (buttplug.width === 1) {
+		if (buttplug.length === 1) {
+			r.push(`It's filled by a standard sized`);
 			if (slave.anus > 2) {
-				r.push(`buttplug, which is on the verge of falling out.`);
+				r.push(`${slave.buttplug}, which is on the verge of falling out.`);
 			} else {
-				r.push(`buttplug.`);
+				r.push(`${slave.buttplug}.`);
 			}
-			break;
-		case "long plug":
+		} else {
 			r.push(`It's filled by a standard sized, overly long`);
 			if (slave.anus > 2) {
-				r.push(`buttplug, which is on the verge of sliding out ${his} rear.`);
+				r.push(`${slave.buttplug}, which is on the verge of sliding out ${his} rear.`);
 			} else {
-				r.push(`buttplug.`);
+				r.push(`${slave.buttplug}.`);
 			}
 			r.push(`It causes a noticeable bulge in ${his} belly.`);
-			break;
-		case "large plug":
+		}
+	} else if (buttplug.width === 2) {
+		if (buttplug.length === 1) {
 			r.push(`It's`);
 			if (slave.anus < 2) {
 				r.push(`agonizingly stretched`);
@@ -640,9 +640,8 @@ App.Desc.buttplug = function(slave, { market, eventDescription } = {}) {
 			} else {
 				r.push(`comfortably stretched`);
 			}
-			r.push(`by a large buttplug.`);
-			break;
-		case "long, large plug":
+			r.push(`by a large ${slave.buttplug}.`);
+		} else {
 			r.push(`It's`);
 			if (slave.anus < 2) {
 				r.push(`agonizingly stretched`);
@@ -651,11 +650,12 @@ App.Desc.buttplug = function(slave, { market, eventDescription } = {}) {
 			} else {
 				r.push(`comfortably stretched`);
 			}
-			r.push(`by a large and long buttplug. It causes a noticeable bulge in ${his} belly.`);
-			break;
-		case "huge plug":
+			r.push(`by a large and long ${slave.buttplug}. It causes a noticeable bulge in ${his} belly.`);
+		}
+	} else if (buttplug.width === 3) {
+		if (buttplug.length === 1) {
 			if (slave.anus < 4) {
-				r.push(`It's agonizingly stretched by a plug so huge ${his} anus is probably being stretched into a permanent gape.`);
+				r.push(`It's agonizingly stretched by a ${slave.buttplug} so huge ${his} anus is probably being stretched into a permanent gape.`);
 				if (slave.fuckdoll === 0) {
 					if (slave.fetish === "masochist" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
 						r.push(`${He}'s frequently in tears from the pain, which is so sharp it often tips ${him} over into spontaneous orgasm.`);
@@ -664,12 +664,11 @@ App.Desc.buttplug = function(slave, { market, eventDescription } = {}) {
 					}
 				}
 			} else {
-				r.push(`Its ridiculous gape is comfortably filled by a huge buttplug.`);
+				r.push(`Its ridiculous gape is comfortably filled by a huge ${slave.buttplug}.`);
 			}
-			break;
-		case "long, huge plug":
+		} else {
 			if (slave.anus < 4) {
-				r.push(`It's agonizingly stretched by a plug so huge it causes ${his} belly to bulge and is likely stretching ${his} anus into a permanent gape.`);
+				r.push(`It's agonizingly stretched by a ${slave.buttplug} so huge it causes ${his} belly to bulge and is likely stretching ${his} anus into a permanent gape.`);
 				if (slave.fuckdoll === 0) {
 					if (slave.fetish === "masochist" && slave.fetishKnown === 1 && slave.fetishStrength > 60) {
 						r.push(`${He}'s frequently in tears from the pain, which is so sharp it often tips ${him} over into spontaneous orgasm.`);
@@ -678,12 +677,11 @@ App.Desc.buttplug = function(slave, { market, eventDescription } = {}) {
 					}
 				}
 			} else {
-				r.push(`Its ridiculous gape is comfortably filled by a wide and long buttplug. It causes a noticeable bulge in ${his} belly.`);
+				r.push(`Its ridiculous gape is comfortably filled by a wide and long ${slave.buttplug}. It causes a noticeable bulge in ${his} belly.`);
 			}
-
-			break;
-		default:
+		}
 	}
+
 	switch (buttplug.width) {
 		case 3:
 			if (slave.buttplugAttachment === "tail") {