diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index ae793cf3975b63645761cb9314646d8740d20df4..0a9ca38ee8f0a5462e8dafc98000df61f243bc4f 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -189,6 +189,30 @@ App.UI.SlaveList.render = function() {
 			}
 		} else if (slave.choosesOwnAssignment === 1) {
 			assignment.innerText = `choose ${getPronouns(slave).possessive} own job`;
+		} else if (slave.assignment === "get treatment in the clinic") {
+			assignment.innerText += ` ${slave.assignment}`;
+			if (slave.health <= 40) {
+				assignment.innerText += ` for poor health`;
+			} else if ((V.Nurse !== 0) && (slave.chem > 15) && (V.clinicUpgradeFilters === 1)) {
+				assignment.innerText += ` for unhealthy chemicals`;
+			} else if ((V.Nurse !== 0) && (slave.pregKnown === 1) && (V.clinicSpeedGestation >= 0 || slave.pregControl === "speed up")) {
+				assignment.innerText += ` to hurry the pregnancy along safely`;
+			} else if ((V.Nurse !== 0) && (slave.pregAdaptation*1000 < slave.bellyPreg || slave.preg > slave.pregData.normalBirth/1.33)) {
+				assignment.innerText += ` while waiting for the child to be born`;
+			} else if ((V.Nurse !== 0) && (V.clinicInflateBelly > 0) && (slave.bellyImplant >= 0) && (slave.bellyImplant <= (V.arcologies[0].FSTransformationFetishistResearch ? 800000 : 130000))) {
+				assignment.innerText += ` to fill implants`;
+			}
+		} else if (slave.assignment === "rest in the spa") {
+			assignment.innerText += ` ${slave.assignment}`;
+			if (slave.fetish === "mindbroken") {
+				assignment.innerText += `,  mindbroken`;
+			} else if ((slave.sexualFlaw !== "none") || (slave.behavioralFlaw !== "none")) {
+				assignment.innerText += `, flawed`;
+			} else if ((slave.trust < 60) || (slave.devotion < 60)) {
+				assignment.innerText += `, learning to accept life as a slave`;
+			} else if (slave.health < 20) {
+				assignment.innerText += ` for poor health`;
+			}
 		} else {
 			assignment.innerText = slave.assignment;
 			if (slave.sentence > 0) {
diff --git a/src/js/slaveSummaryWidgets.js b/src/js/slaveSummaryWidgets.js
index 81110a4541c767d6b599aea6672307138526c898..5eba9b9aea3090eee8023a318e2ac5cad6c6779b 100644
--- a/src/js/slaveSummaryWidgets.js
+++ b/src/js/slaveSummaryWidgets.js
@@ -726,7 +726,7 @@ window.SlaveSummaryUncached = (function() {
 			if(slave.chem > 15) {
 				makeSpan(c, `C${Math.ceil(slave.chem/10)}`, ["cyan", "strong"]);
 			} else if (slave.chem <= 15 && slave.assignment === "get treatment in the clinic") {
-				makeSpan(c, `Discharged: ${slave.name}.`, ["green", "strong"]);
+				makeSpan(c, `Safe chem levels: ${slave.slaveName}.`, ["green", "strong"]);
 			}
 		}
 	}
@@ -756,7 +756,7 @@ window.SlaveSummaryUncached = (function() {
 			if(slave.chem > 15) {
 				makeSpan(c, `Carcinogen buildup: ${Math.ceil(slave.chem/10)}.`, "cyan");
 			} else if (slave.chem <= 15 && slave.assignment === "get treatment in the clinic") {
-				makeSpan(c, `Discharged: ${slave.name}.`, "green");
+				makeSpan(c, `Safe chem levels: ${slave.slaveName}.`, "green");
 			}
 		}
 	}