diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index ae793cf3975b63645761cb9314646d8740d20df4..85381a0bffb75da7cc84650701ae359a4eade18c 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -195,6 +195,66 @@ App.UI.SlaveList.render = function() {
 				assignment.innerText += ` ${slave.sentence} weeks`;
 			}
 		}
+		if (slave.assignment === "get treatment in the clinic") {
+			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") {
+			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 if (slave.assignment === "learn in the schoolroom") {
+			let lessons = [];
+			let i;
+			if (!slave.intelligenceImplant >= 30) {
+				lessons.push("general");
+			}
+			if (!((slave.voice === 0) || (slave.accent <= 1) || ((V.schoolroomUpgradeLanguage === 0) && (slave.accent <= 2)))) {
+				lessons.push("speech");
+			}
+			if (!((slave.skill.oral > 30) || ((V.schoolroomUpgradeSkills === 0) && (slave.skill.oral > 10)))) {
+				lessons.push("oral");
+			}
+			if (!((slave.skill.whoring > 30) || ((V.schoolroomUpgradeSkills === 0) && (slave.skill.whoring > 10)))) {
+				lessons.push("whoring");
+			}
+			if (!((slave.skill.entertainment > 30) || ((V.schoolroomUpgradeSkills === 0) && (slave.skill.entertainment > 10)))) {
+				lessons.push("entertainment");
+			}
+			if (!((slave.skill.anal > 30) || ((V.schoolroomUpgradeSkills === 0) && (slave.skill.anal > 10)))) {
+				lessons.push("anal");
+			}
+			if (!((slave.skill.vaginal > 30) || ((V.schoolroomUpgradeSkills === 0) && (slave.skill.vaginal > 10)) || (slave.vagina < 0))) {
+				lessons.push("vaginal");
+			}
+			if (lessons.length > 0) {
+				assignment.innerText += ", practicing: ";
+			} else {
+				assignment.innerText += ", studying for finals";
+			}
+			for (i = 0; i < lessons.length; i++) {
+				assignment.innerText += lessons[i];
+				if (i === (lessons.length - 2)) {
+					assignment.innerText += " and ";
+				} else if (i < (lessons.length - 2)) {
+					assignment.innerText += ", ";
+				}
+			}
+		}
 		assignment.innerText += ". ";
 		res.appendChild(assignment);
 
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");
 			}
 		}
 	}