diff --git a/js/003-data/gameVariableData.js b/js/003-data/gameVariableData.js
index 31eec13a017d7b762f927b9d5b8af6af2a0b566b..45b686d75a195eeda674679907a99e1ce1f1a1f5 100644
--- a/js/003-data/gameVariableData.js
+++ b/js/003-data/gameVariableData.js
@@ -1066,8 +1066,7 @@ App.Data.resetOnNGPlus = {
 	stewardessImpregnates: 0,
 	/** @type {FC.SlaveStateOrZero} */
 	Schoolteacher: 0,
-	/** @type {FC.SlaveStateOrZero} */
-	Attendant: 0,
+	AttendantID: 0,
 	/** @type {FC.SlaveStateOrZero} */
 	Matron: 0,
 	/** @type {FC.SlaveStateOrZero} */
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index 35a951cc169998f404a8493ee18aa7d914539bfc..d0214570e62b34fef2e74608779371cf8388a9a6 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,7 @@
 App.Version = {
 	base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
 	pmod: "3.4.0",
-	release: 1067,
+	release: 1068,
 };
 
 /* Use release as save version */
diff --git a/src/004-base/specialSlavesProxy.js b/src/004-base/specialSlavesProxy.js
index 8e6c1c7af988ef59c5d713c0d494f700ab11520a..36ca1085ab44f8531695f28c0e3f66b3edb69cad 100644
--- a/src/004-base/specialSlavesProxy.js
+++ b/src/004-base/specialSlavesProxy.js
@@ -3,7 +3,7 @@ App.SpecialSlavesProxy = class SpecialSlavesProxy {
 	}
 
 	get Attendant() {
-		return V.Attendant;
+		return slaveStateById(V.AttendantID);
 	}
 	get Bodyguard() {
 		return V.Bodyguard;
diff --git a/src/arcologyBuilding/penthouse.js b/src/arcologyBuilding/penthouse.js
index 458774aa974367fab4843b798a1e286b6cc5b00f..819e4b71992cb04d315855b77896f958583d0d88 100644
--- a/src/arcologyBuilding/penthouse.js
+++ b/src/arcologyBuilding/penthouse.js
@@ -68,7 +68,7 @@ App.Arcology.Cell.Penthouse = class extends App.Arcology.Cell.BaseCell {
 
 		if (V.spa) {
 			wrapper.append(createFacilityDiv(App.UI.DOM.passageLink(spaUIName(), "Spa"),
-				`(${V.SpaiIDs.length}/${V.spa}${V.Attendant ? ", L" : ""})`));
+				`(${V.SpaiIDs.length}/${V.spa}${S.Attendant ? ", L" : ""})`));
 		}
 
 		if (V.nursery) {
@@ -109,7 +109,7 @@ App.Arcology.Cell.Penthouse = class extends App.Arcology.Cell.BaseCell {
 		return fragment;
 
 		/**
-		 * @returns {Node}
+		 * @returns {HTMLDivElement}
 		 */
 		function getWrapper(outer) {
 			const wrapper = document.createElement("div");
@@ -124,7 +124,7 @@ App.Arcology.Cell.Penthouse = class extends App.Arcology.Cell.BaseCell {
 		/**
 		 *
 		 * @param {HTMLElement} link
-		 * @param {Node|string} content
+		 * @param {(Node|string)[]} content
 		 * @returns {HTMLDivElement}
 		 */
 		function createFacilityDiv(link, ...content) {
diff --git a/src/data/backwardsCompatibility/datatypeCleanup.js b/src/data/backwardsCompatibility/datatypeCleanup.js
index 817f7e16407de81e1412077dbf7b237684621e80..716a0eaa5c33197583e78a5caede5a000036763e 100644
--- a/src/data/backwardsCompatibility/datatypeCleanup.js
+++ b/src/data/backwardsCompatibility/datatypeCleanup.js
@@ -1975,6 +1975,15 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		}
 	}
 
+	/**
+	 * @param {function(App.Entity.SlaveState):boolean} predicate
+	 * @returns {number} ID of the first matched slave or 0 if no match was founds
+	 */
+	function findSlaveId(predicate) {
+		const s = V.slaves.find(predicate);
+		return s ? s.ID : 0;
+	}
+
 	function FacilityDatatypeCleanup() {
 		/* common variables */
 		FacilityIDArrayCleanup();
@@ -2167,7 +2176,7 @@ globalThis.FacilityDatatypeCleanup = (function() {
 		V.spa = Math.max(+V.spa, 0) || 0;
 		V.spaUpgrade = Math.clamp(+V.spaUpgrade, 0, 1) || 0;
 		/* attendant */
-		V.Attendant = V.slaves.find(s => s.assignment === "be the Attendant") || 0;
+		V.AttendantID = findSlaveId(s => s.assignment === Job.ATTENDANT);
 		V.spaFix = Math.clamp(+V.spaFix, 0, 2) || 0;
 	}
 
diff --git a/src/endWeek/endWeek.js b/src/endWeek/endWeek.js
index 9e85353fffe49c46b898e94893944817959c0b0d..8aba75de32d618bc0cf7c73e1a68198208f22c5b 100644
--- a/src/endWeek/endWeek.js
+++ b/src/endWeek/endWeek.js
@@ -301,7 +301,6 @@ globalThis.endWeek = (function() {
 		V.Schoolteacher = 0;
 		V.Wardeness = 0;
 		V.Concubine = 0;
-		V.Attendant = 0;
 		V.Matron = 0;
 		V.Nurse = 0;
 		V.Bodyguard = 0;
diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 46104c3f5316972a715eec29e013e5c3a97a5cf6..0f9ac5b1da9f8229ae903a29f3cb00e8524c3b11 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -384,14 +384,14 @@ globalThis.tired = function(slave) {
 
 	if (!slave.fuckdoll) {
 		// Assignment
-		if (["rest in the spa"].includes(slave.assignment)) {
+		if ([Job.SPA].includes(slave.assignment)) {
 			assignment -= 40 * (V.spaUpgrade + 1); // Reduces tired by an average of 40 points while in the spa, double with the upgraded spa
-			if (V.Attendant !== 0) {
+			if (S.Attendant) {
 				let skillBonus;
-				if (setup.attendantCareers.includes(V.Attendant.career)) {
+				if (setup.attendantCareers.includes(S.Attendant.career)) {
 					skillBonus = 200;
 				} else {
-					skillBonus = V.Attendant.skill.attendant;
+					skillBonus = S.Attendant.skill.attendant;
 				}
 				assignment -= Math.trunc(skillBonus / 10); // Maximum of 20 extra points of negative tiredness due to attendant skill
 			}
@@ -403,7 +403,7 @@ globalThis.tired = function(slave) {
 			assignment += 22; // Always busy. Could benefit from a helper...
 		} else if (["be the Matron", "be the Stewardess", "be the Milkmaid", "be the Farmer", "be the DJ", "be the Madam", "be the Schoolteacher", "be the Wardeness", "be the Nurse"].includes(slave.assignment)) { // Heads are very busy, but always have luxurious conditions, so it balances out, save for the exceptions
 			assignment += 15;
-		} else if (["be the Attendant", "be your Concubine"].includes(slave.assignment)) { // Cushy head positions
+		} else if ([Job.ATTENDANT, "be your Concubine"].includes(slave.assignment)) { // Cushy head positions
 			assignment += 5;
 		} else if (["recruit girls"].includes(slave.assignment)) {
 			if (H.tired > 80) { // I'll take it easy a week to better recruit the next.
diff --git a/src/endWeek/saChoosesOwnClothes.js b/src/endWeek/saChoosesOwnClothes.js
index 04c1c55b30d3492d6fae7fe63cc224793a06ad0d..b66a534c12efdef4e463b7a4801d7dae3fef07a6 100644
--- a/src/endWeek/saChoosesOwnClothes.js
+++ b/src/endWeek/saChoosesOwnClothes.js
@@ -343,7 +343,7 @@ App.SlaveAssignment.choosesOwnClothes = (function() {
 				if (isItemAccessible.entry("stretch pants and a crop-top") === true) {
 					wardrobeAssignment.push({text: `and decides to take it easy by slipping into some stretch pants. They come off just as quickly as they come on, just in case.`, clothes: "stretch pants and a crop-top"});
 				}
-			} else if (slave.assignment === "be the Attendant") {
+			} else if (slave.assignment === Job.ATTENDANT) {
 				wardrobeAssignment.push({text: `and wears a string bikini, since it's all ${he} can wear that won't be ruined by all the moisture in the spa.`, clothes: "a string bikini"});
 				if (isItemAccessible.entry("a monokini") === true) {
 					wardrobeAssignment.push({text: `and wears an one-piece swimsuit, since it's all ${he} can wear that won't be ruined by all the moisture in the spa.`, clothes: "a monokini"});
diff --git a/src/endWeek/saRest.js b/src/endWeek/saRest.js
index 2dd55055c34373e1d06c18ac91ce1b2d210847fe..c4a7e1596b1a0784a15c146dcd773bd643c7e2c3 100644
--- a/src/endWeek/saRest.js
+++ b/src/endWeek/saRest.js
@@ -84,8 +84,8 @@ App.SlaveAssignment.rest = function(slave) {
 			if (V.spaUpgrade > 0) {
 				t += ` ${V.spaNameCaps}'s luxuries help ${him} relax.`;
 			}
-			if (V.Attendant !== 0) {
-				t += ` ${V.Attendant.slaveName}'s fingers know just how to refresh ${his} tired body.`;
+			if (S.Attendant) {
+				t += ` ${S.Attendant.slaveName}'s fingers know just how to refresh ${his} tired body.`;
 			}
 		}
 	}
diff --git a/src/endWeek/saRules_old.js b/src/endWeek/saRules_old.js
index 906bb4875c7f60c08b44776e9079355f1a9d213b..a4573589196abd02015be0003d33cf813c8a9b01 100644
--- a/src/endWeek/saRules_old.js
+++ b/src/endWeek/saRules_old.js
@@ -382,7 +382,7 @@
 								case "relaxation":
 									r += `${He}'s given free time, which ${he}`;
 									if (V.spa && V.spaSpots > 0) {
-										r += `usually spends in ${V.spaName}${V.Attendant ? ` enjoying ${Attendant.slaveName}'s care` : ``}. `;
+										r += `usually spends in ${V.spaName}${S.Attendant ? ` enjoying ${S.Attendant.slaveName}'s care` : ``}. `;
 										improveCondition(slave, rewards * 2);
 										slave.health.tired -= Math.ceil(Math.max(normalRandInt(rewards * 3), 1) * (1 + V.spaUpgrade / 2));
 										V.spaSpots -= rewards * 2;
diff --git a/src/gui/storyCaption.tw b/src/gui/storyCaption.tw
index c3f026e1030fa1eac744f13cbfbb7b1d59e3e3e8..52c9d78cc6ba2fcd42c9fbe25eb218b56d74a641 100644
--- a/src/gui/storyCaption.tw
+++ b/src/gui/storyCaption.tw
@@ -400,9 +400,9 @@
 				<<if ($spa)>>
 					<br> <<link "$spaNameCaps""Spa">><</link>>
 					<<if $abbreviateSidebar == 2>>
-						($SpaiIDs.length/$spa <<if $SpaiIDs.length != 1>>bathers<<else>>bathing<</if>><<if $Attendant>>, attendant<</if>>)
+						($SpaiIDs.length/$spa <<if $SpaiIDs.length != 1>>bathers<<else>>bathing<</if>><<if _S.Attendant>>, attendant<</if>>)
 					<<else>>
-						($SpaiIDs.length/$spa<<if $Attendant>>, L<</if>>)
+						($SpaiIDs.length/$spa<<if _S.Attendant>>, L<</if>>)
 					<</if>>
 				<</if>>
 				<<if ($nursery)>>
diff --git a/src/interaction/main/walkPast.js b/src/interaction/main/walkPast.js
index f7f2b89d69e066a77c37da844561d78655809be3..181a0d311e1ab5838b5e96a4bf512615b4c62338 100644
--- a/src/interaction/main/walkPast.js
+++ b/src/interaction/main/walkPast.js
@@ -169,7 +169,7 @@ globalThis.walkPast = (function() {
 			} else if (activeSlave.assignment === "work in the dairy" && V.dairyRestraintsSetting > 1) {
 				output += ` ${He} is strapped into a milking machine and cannot leave ${V.dairyName}.`;
 			} else {
-				if (["be confined in the arcade", "be confined in the cellblock", "be the Attendant", "be the DJ", "be the Madam", "be the Milkmaid", "be the Schoolteacher", "be the Stewardess", "be the Wardeness", "be your agent", "be your Concubine", "live with your agent", "live with your Head Girl", "serve in the club", "serve in the master suite", "stay confined", "work a glory hole", "work as a servant", "work in the brothel", "work in the dairy"].includes(activeSlave.assignment)) {
+				if (["be confined in the arcade", "be confined in the cellblock", Job.ATTENDANT, "be the DJ", "be the Madam", "be the Milkmaid", "be the Schoolteacher", "be the Stewardess", "be the Wardeness", "be your agent", "be your Concubine", "live with your agent", "live with your Head Girl", "serve in the club", "serve in the master suite", "stay confined", "work a glory hole", "work as a servant", "work in the brothel", "work in the dairy"].includes(activeSlave.assignment)) {
 					output += ` <span id="walkpast"><<link "Have ${him} take a break and come up">><<replace "#walk">><<include $target>><</replace>><</link>></span>`;
 				} else {
 					output += ` <span id="walkpast"><<link "Call ${him} over">><<replace "#walk">><<include $target>><</replace>><</link>></span>`;
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 03762812ba6282bd41786c3234df9b74d3d38d5a..5112de462868ffd68d726f484113c75a50c11445 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -78,7 +78,7 @@ globalThis.inferiorRaceP = function(slave) {
  */
 globalThis.isLeaderP = function(slave) {
 	/** @type {FC.SlaveStateOrZero[]} */
-	const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, V.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V.Farmer, V.Stewardess, V.Schoolteacher, V.Wardeness];
+	const leaders = [V.HeadGirl, V.Bodyguard, V.Recruiter, V.Concubine, V.Nurse, S.Attendant, V.Matron, V.Madam, V.DJ, V.Milkmaid, V.Farmer, V.Stewardess, V.Schoolteacher, V.Wardeness];
 	return leaders.some(leader => leader.ID && leader.ID === slave.ID);
 };
 
diff --git a/src/js/assignJS.js b/src/js/assignJS.js
index a9b182499f72a9f08cdc424732ff8d5029342599..a1c8f53a3a4fee19d7aab0e0ddfd76938d69aed1 100644
--- a/src/js/assignJS.js
+++ b/src/js/assignJS.js
@@ -297,7 +297,7 @@ globalThis.assignJob = function(slave, job) {
 			slave.rules.living = "normal";
 			break;
 
-		case "be the attendant":
+		case Job.ATTENDANT.toLowerCase():
 			uniqueJob("Attendant");
 			slave.assignment = job;
 			slave.rules.living = "luxurious";
@@ -502,8 +502,8 @@ globalThis.removeJob = function(slave, assignment, saveRecord) {
 			V.Farmer = 0;
 		} else if (V.Schoolteacher !== 0 && slave.ID === V.Schoolteacher.ID) {
 			V.Schoolteacher = 0;
-		} else if (V.Attendant !== 0 && slave.ID === V.Attendant.ID) {
-			V.Attendant = 0;
+		} else if (V.AttendantID === slave.ID) {
+			V.AttendantID = 0;
 		} else if (V.Matron !== 0 && slave.ID === V.Matron.ID) {
 			V.Matron = 0;
 		} else if (V.Nurse !== 0 && slave.ID === V.Nurse.ID) {
diff --git a/src/pregmod/widgets/pregmodBirthWidgets.tw b/src/pregmod/widgets/pregmodBirthWidgets.tw
index bbdc200660017ad7b26bb5b2883da2b389b8da91..733708b96d901a75dc0467a8ae28429d17b1f24f 100644
--- a/src/pregmod/widgets/pregmodBirthWidgets.tw
+++ b/src/pregmod/widgets/pregmodBirthWidgets.tw
@@ -600,25 +600,25 @@
 	<</if>>
 
 <<case "rest in the spa">>
-	<<if ($Attendant != 0)>>
-		<<setLocalPronouns $Attendant 2>>
+	<<if (_S.Attendant)>>
+		<<setLocalPronouns _S.Attendant 2>>
 	<</if>>
 	<<if $slaves[$i].fetish == "mindbroken">>
 		<<if (random(1,20) > $suddenBirth)>>
-			<<if $Attendant != 0>>$Attendant.slaveName leads $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is lead to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to $his watching caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the spa.
+			<<if _S.Attendant>>_S.Attendant.slaveName leads $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is lead to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, indifferent to $his watching caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the spa.
 		<<else>>
-			While soaking in the spa's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if $Attendant != 0>>$Attendant.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
+			While soaking in the spa's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if _S.Attendant>>_S.Attendant.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
 			<<ClothingBirth>>
 			$He and <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child are quickly dried off as $he begins nursing it. A servant soon arrives to take $his child away.
 		<</if>>
 	<<else>>
 		<<if (random(1,20) > $suddenBirth)>>
-			<<if $Attendant != 0>>$Attendant.slaveName escorts $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, aided by $his caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the spa.
+			<<if _S.Attendant>>_S.Attendant.slaveName escorts $him to a special pool designed to give birth in. Once $he is safely in the water alongside _him2,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, aided by $his caretaker. $His child is promptly taken and, following a cleaning of $his still very gravid body, $he is taken back to the spa.
 		<<else>>
 			<<if !canWalk($slaves[$i])>>While changing in the changing room before a nice soak, $slaves[$i].slaveName's water breaks. $He hurries to find someone to help $him but only finds curious onlookers<<else>>While heading for the changing room before a nice soak, $slaves[$i].slaveName's water breaks. $He hurries into the changing room only to find it unusually crowded<</if>>. Without any choice left, $he assumes a birthing position.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			Several of other slaves present help $him with <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child while the rest finish pleasuring themselves over the show. <<if $Attendant != 0>>$Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child away and $he is ushered into the bath to clean up and relax<</if>>.
+			Several of other slaves present help $him with <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> child while the rest finish pleasuring themselves over the show. <<if _S.Attendant>>_S.Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child away and $he is ushered into the bath to clean up and relax<</if>>.
 		<</if>>
 	<</if>>
 
@@ -953,7 +953,7 @@
 
 <<case "be the Attendant">>
 	<<if (random(1,20) > $suddenBirth)>>
-		$Attendant.slaveName waddles to a special pool designed to give birth in. Once $he is safely in the water, $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, something $he has been trained for. $His child is promptly taken and, following a cleaning, $he heads back to the main pool.
+		_S.Attendant.slaveName waddles to a special pool designed to give birth in. Once $he is safely in the water, $he begins to push out <<if $slaves[$i].counter.birthsTotal == 0>>$his first<<else>>this week's<</if>> baby, something $he has been trained for. $His child is promptly taken and, following a cleaning, $he heads back to the main pool.
 	<<else>>
 		While tending to the guests in the spa, $slaves[$i].slaveName's water breaks. The slaves quickly come to $his aid as the contractions get closer and closer together. Their hands are all over $his laboring body, unsure of what they should be doing.
 		<<set $humiliation = 1>>
@@ -1626,24 +1626,24 @@
 <<case "rest in the spa">>
 	<<if !canWalk($slaves[$i])>>
 		<<if $slaves[$i].fetish == "mindbroken">>
-			While soaking in the spa's pool, $slaves[$i].slaveName's body begins to birth another of $his brood. As $he begins to ready $himself for birth, <<if $Attendant != 0>>$Attendant.slaveName struggles to pull $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
+			While soaking in the spa's pool, $slaves[$i].slaveName's body begins to birth another of $his brood. As $he begins to ready $himself for birth, <<if _S.Attendant>>_S.Attendant.slaveName struggles to pull $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
 			<<ClothingBirth>>
 			$He and $his child are quickly dried off as $he begins nursing them. A servant soon arrives to take $his children away.
 		<<else>>
-			While soaking in the spa's pool, $slaves[$i].slaveName's body begins to birth another of $his brood. As $he begins to ready $himself for a water birth, <<if $Attendant != 0>>$Attendant.slaveName shifts into position to aid $him<<else>>the other bathers watch curiously<</if>>.
+			While soaking in the spa's pool, $slaves[$i].slaveName's body begins to birth another of $his brood. As $he begins to ready $himself for a water birth, <<if _S.Attendant>>_S.Attendant.slaveName shifts into position to aid $him<<else>>the other bathers watch curiously<</if>>.
 			<<ClothingBirth>>
 			$He and $his child are quickly dried off as $he begins nursing them. A servant soon arrives to take $his children away.
 		<</if>>
 	<<else>>
 		<<if $slaves[$i].fetish == "mindbroken">>
-			While soaking in the spa's pool, $slaves[$i].slaveName's body begins to birth another of $his brood. As $he begins to ready $himself for birth, <<if $Attendant != 0>>$Attendant.slaveName struggles to pull $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
+			While soaking in the spa's pool, $slaves[$i].slaveName's body begins to birth another of $his brood. As $he begins to ready $himself for birth, <<if _S.Attendant>>_S.Attendant.slaveName struggles to pull $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
 			<<ClothingBirth>>
 			$He and $his child are quickly dried off as $he begins nursing them. A servant soon arrives to take $his children away.
 		<<else>>
 			While heading for the changing room before a nice soak, $slaves[$i].slaveName's body begins to birth another of $his brood. $He hurries into the changing room only to find it unusually crowded. Without any choice left, $he assumes a birthing position.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			The several of other slaves present, that aren't pinned by $his sudden intrusion, help $him with $his child while the rest enjoy the show. <<if $Attendant != 0>>$Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child away, and $he is ushered into the bath to clean up and relax<</if>>.
+			The several of other slaves present, that aren't pinned by $his sudden intrusion, help $him with $his child while the rest enjoy the show. <<if _S.Attendant>>_S.Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child away, and $he is ushered into the bath to clean up and relax<</if>>.
 		<</if>>
 	<</if>>
 
diff --git a/src/uncategorized/PETS.tw b/src/uncategorized/PETS.tw
index 3a02a6a8863bbb654c9ff182a80ff0f3ee8358a0..c463f473ade377fd792544dc1be0bf566eb91334 100644
--- a/src/uncategorized/PETS.tw
+++ b/src/uncategorized/PETS.tw
@@ -51,7 +51,7 @@
 	<<case "abusive wardeness">>
 		<<set $activeSlave = $Wardeness, $subSlave = $slaves.find(function(s) { return s.assignment == "be confined in the cellblock"; })>>
 	<<case "comforting attendant">>
-		<<set $activeSlave = $Attendant, $subSlave = $slaves.find(function(s) { return s.assignment == "rest in the spa"; })>>
+		<<set $activeSlave = _S.Attendant, $subSlave = $slaves.find(function(s) { return s.assignment == "rest in the spa"; })>>
 <</switch>>
 
 <<set $desc = SlaveTitle($activeSlave)>>
diff --git a/src/uncategorized/REFS.tw b/src/uncategorized/REFS.tw
index 6687a1f8c66e25e4f941338213580e08579b8f20..e67f990d3fa6ecc688275b1765bc13cc4c787d14 100644
--- a/src/uncategorized/REFS.tw
+++ b/src/uncategorized/REFS.tw
@@ -471,7 +471,7 @@
 				<</replace>>
 			<</link>> // The treatment will cost <<print cashFormat(1000)>>. //
 		<</if>>
-		<<if ($Attendant != 0)>>
+		<<if (_S.Attendant)>>
 			<br><<link "Give $him a day of pampering with your attendant at your spa">>
 				<<replace "#result">>
 					You make your presence known to the citizen, and once the usual shock and disbelief have worn off it takes a moment to convince $him that your offer of a cleansing experience in your spa is neither a cruel joke nor an underhanded attempt to enslave $him. $He follows you back to the penthouse where you inform your attendant that the citizen is to be sequestered in the spa for a day of pampering, cleansing and rejuvenation. As the citizen passes through the doors to the spa, $he turns and blows you a kiss of gratitude.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index d3a48410bcec1f46c88217d06e0fa0acc1753939..e0cfebe7a92a1d3c15a5132115d9694001451589 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -686,7 +686,7 @@ The walk-in cooling unit is designed for the refrigeration of food for you and g
 
 <<case "spa boobs">>
 
-The steamy air and hot water of the spa aren't only for slaves assigned to rest there full-time. When you head in to soak the day's stress away one evening, you see the back of <<= App.UI.slaveDescriptionDialog($activeSlave)>>'s head resting against the edge of the warm pool; $he's clearly come in after work. <<if canHear($activeSlave)>>$He doesn't hear you come in and stays fully relaxed.<<else>>$He's relaxed enough to exit the state of "high alert" $his deafness usually forces $him to be in.<</if>> By the time you've showered<<if $Attendant != 0>>, fucked the compliant $Attendant.slaveName,<</if>> and gotten ready to enter the pool, $he's reached such a state of blissful relaxation that $he slides $his body off the ledge around the side of the pool and floats face-up with $his eyes closed.
+The steamy air and hot water of the spa aren't only for slaves assigned to rest there full-time. When you head in to soak the day's stress away one evening, you see the back of <<= App.UI.slaveDescriptionDialog($activeSlave)>>'s head resting against the edge of the warm pool; $he's clearly come in after work. <<if canHear($activeSlave)>>$He doesn't hear you come in and stays fully relaxed.<<else>>$He's relaxed enough to exit the state of "high alert" $his deafness usually forces $him to be in.<</if>> By the time you've showered<<if _S.Attendant>>, fucked the compliant _S.Attendant.slaveName,<</if>> and gotten ready to enter the pool, $he's reached such a state of blissful relaxation that $he slides $his body off the ledge around the side of the pool and floats face-up with $his eyes closed.
 <br><br>
 The sight is comical. <<if $activeSlave.belly >= 5000 || $activeSlave.weight > 95>>Four<<else>>Three<</if>> things break the surface of the water: $his $activeSlave.skin face,
 <<if $activeSlave.belly >= 5000 || $activeSlave.weight > 95>>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 4e4fc6ce06998e1fd7c1aea25074a593c51fbfca..dbd0b6c68435640072ec204d6a820caa1ded4ad7 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -1138,7 +1138,7 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 	<<set $slaves[$slaveIndices[$subSlave.ID]] = $subSlave>>
 	<</replace>>
 <</link>> //This will cost <<print cashFormat(500)>>//
-<<if $Attendant != 0 && $Attendant.ID != $activeSlave.ID && $Attendant.ID != $subSlave.ID>>
+<<if $AttendantID != $activeSlave.ID && $AttendantID != $subSlave.ID>>
 	<br><<link "Give them a night at the Spa together">>
 
 		<<set _clothesTemp = $activeSlave.clothes, $activeSlave.clothes = "no clothing">>
@@ -1161,10 +1161,10 @@ $he adds impishly. <<if canHear($subSlave)>>Hearing this<<else>>Realizing your p
 		<<set $subSlave.clothes = _clothesTemp2>>
 
 		<<replace "#result">>
-		<<setLocalPronouns $Attendant 3>>
-		Rather than answering $him directly, you tell $assistant.name to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening, and then contact $Attendant.slaveName, the Attendant of your Spa, to instruct _him3 to expect the two slaves for some quality time together. $Attendant.slaveName, of course, is all for it ("Leave it to me, <<Master $Attendant>>!"). _He3 greets the couple at the steamy entrance to the Spa an hour later, and takes charge of them with a matronly air, telling them to undress and relax.
+		<<setLocalPronouns _S.Attendant 3>>
+		Rather than answering $him directly, you tell $assistant.name to clear $activeSlave.slaveName's and $subSlave.slaveName's schedules for the evening, and then contact _S.Attendant.slaveName, the Attendant of your Spa, to instruct _him3 to expect the two slaves for some quality time together. _S.Attendant.slaveName, of course, is all for it ("Leave it to me, <<Master _S.Attendant>>!"). _He3 greets the couple at the steamy entrance to the Spa an hour later, and takes charge of them with a matronly air, telling them to undress and relax.
 		<br><br>
-		It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it, and your Attendant does not disappoint. After the slaves have soaked in the main pool for a while, _he3 gives them a series of mud packs, hot rock massages, and skin treatments, always setting them up right next to each other. They chat a bit at first, but soon relax into companionable silence, holding hands and enjoying the pampering.<<if $Attendant.lactation > 0>> $Attendant.slaveName has their evening meal sent down, and supplements it with milk drunk fresh from _his3 own nipples.<</if>> This being your penthouse, _his3 services become quite sexual later in the night, as the Attendant applies all _his3 talents in choosing positions that emphasize $activeSlave.slaveName and $subSlave.slaveName being close to each other<<if $Attendant.bellyPreg >= 10000 && $activeSlave.bellyPreg >= 10000 && $subSlave.bellyPreg >= 10000>>, a difficult task given that they are all heavily pregnant,<<elseif $Attendant.belly >= 10000 && $activeSlave.belly >= 10000 && $subSlave.belly >= 10000>>, a difficult task given how big everyone's bellies are,<</if>> as they share $Attendant.slaveName's body. Much later, the Attendant sends you a brief message relaying their @@.hotpink;heartfelt thanks,@@ which _he3's passing to you because they're asleep together.
+		It costs you a small sum in upkeep and other trifles to cover an unexpected unavailability of both slaves, but they deserve it, and your Attendant does not disappoint. After the slaves have soaked in the main pool for a while, _he3 gives them a series of mud packs, hot rock massages, and skin treatments, always setting them up right next to each other. They chat a bit at first, but soon relax into companionable silence, holding hands and enjoying the pampering.<<if _S.Attendant.lactation > 0>> _S.Attendant.slaveName has their evening meal sent down, and supplements it with milk drunk fresh from _his3 own nipples.<</if>> This being your penthouse, _his3 services become quite sexual later in the night, as the Attendant applies all _his3 talents in choosing positions that emphasize $activeSlave.slaveName and $subSlave.slaveName being close to each other<<if _S.Attendant.bellyPreg >= 10000 && $activeSlave.bellyPreg >= 10000 && $subSlave.bellyPreg >= 10000>>, a difficult task given that they are all heavily pregnant,<<elseif _S.Attendant.belly >= 10000 && $activeSlave.belly >= 10000 && $subSlave.belly >= 10000>>, a difficult task given how big everyone's bellies are,<</if>> as they share _S.Attendant.slaveName's body. Much later, the Attendant sends you a brief message relaying their @@.hotpink;heartfelt thanks,@@ which _he3's passing to you because they're asleep together.
 		<<run cashX(-500, "event", $activeSlave)>>
 		<<set $subSlave.devotion += 3>>
 		<<set $activeSlave.devotion += 3>>
diff --git a/src/uncategorized/attendantSelect.tw b/src/uncategorized/attendantSelect.tw
index f4491f37da92e9bd18c1ba55c3f3320f2c3e83b6..71f6d26043b6d0c23776d99cf2172698a37c60f5 100644
--- a/src/uncategorized/attendantSelect.tw
+++ b/src/uncategorized/attendantSelect.tw
@@ -1,15 +1,14 @@
 :: Attendant Select [nobr]
 
 <<set $nextButton = "Back", $nextLink = "Spa", $showEncyclopedia = 1, $encyclopedia = "Attendant">>
-<<if ($Attendant != 0)>>
-	<<set $Attendant = getSlave($Attendant.ID)>>
-	<<setLocalPronouns $Attendant>>
-	<span class='slave-name'><<= SlaveFullName($Attendant)>></span> is serving as your Attendant.<br><br>$He will help pamper and counsel your slaves.
+<<if _S.Attendant>>
+	<<setLocalPronouns _S.Attendant>>
+	<span class='slave-name'><<= SlaveFullName(_S.Attendant)>></span> is serving as your Attendant.<br><br>$He will help pamper and counsel your slaves.
 <<else>>
 	You have not selected an Attendant.
 <</if>>
 
 <br><br>''Appoint an Attendant from your devoted slaves:''
-<br><br>[[None|Spa][removeJob($Attendant, "be the Attendant")]]
+<br><br>[[None|Spa][removeJob(_S.Attendant, Job.ATTENDANT)]]
 <br><br>
 <<print App.UI.SlaveList.facilityManagerSelection(App.Entity.facilities.spa, "Spa")>>
diff --git a/src/uncategorized/randomNonindividualEvent.tw b/src/uncategorized/randomNonindividualEvent.tw
index 4f8716bde985f5a6f4e63311c167a2d111398f08..649b473dfd46acd67cbdb409d3e611621b208717 100644
--- a/src/uncategorized/randomNonindividualEvent.tw
+++ b/src/uncategorized/randomNonindividualEvent.tw
@@ -435,7 +435,7 @@
 		<<set $PETSevent.push("abusive wardeness")>>
 	<</if>>
 
-	<<if ($Attendant != 0) && ($SpaiIDs.length > 0) && canTalk($Attendant)>>
+	<<if (_S.Attendant) && ($SpaiIDs.length > 0) && canTalk(_S.Attendant)>>
 		<<set $PETSevent.push("comforting attendant")>>
 	<</if>>
 
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 4bdd97e758d3d6c43b82ca4c11875acb92b4bf21..01775d78605a4f0ff7b6abcee7ba94d8c800dd90 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -113,7 +113,7 @@
 <<if ($activeSlave.ID == $Concubine.ID)>>
 	<<set _qualifiedNicknames.push("Concubine")>>
 <</if>>
-<<if ($activeSlave.ID == $Attendant.ID)>>
+<<if ($activeSlave.ID == $AttendantID)>>
 	<<set _qualifiedNicknames.push("Attendant")>>
 <</if>>
 <<if ($activeSlave.ID == $Matron.ID)>>
diff --git a/src/uncategorized/saChoosesOwnJob.tw b/src/uncategorized/saChoosesOwnJob.tw
index 849db7560e048932466aca30a3e96dff243501a9..595c2d6928e1132b61d29d3741d6d1cd048c64ed 100644
--- a/src/uncategorized/saChoosesOwnJob.tw
+++ b/src/uncategorized/saChoosesOwnJob.tw
@@ -63,7 +63,7 @@
 			<<= assignJob($slaves[$i], "take classes")>>
 		<</if>>
 
-	<<elseif ($Attendant != 0) && ($universalRulesAssignsSelfFacility == 1) && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45) || ($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none"))>>
+	<<elseif (_S.Attendant) && ($universalRulesAssignsSelfFacility == 1) && (($slaves[$i].devotion < 45) || ($slaves[$i].trust < 45) || ($slaves[$i].sexualFlaw != "none") || ($slaves[$i].behavioralFlaw != "none"))>>
 		<<set $slaves[$i].choosesOwnAssignmentText += " could use some counseling, so $he decides to visit $spaName.">>
 		<<= assignJob($slaves[$i], "rest in the spa")>>
 
diff --git a/src/uncategorized/saRelationships.tw b/src/uncategorized/saRelationships.tw
index 98ea14731b8fcd167d56c77c6fb764cf160ecfb5..a6d00acccdd09a2b53be5e6aef30a5d322606040 100644
--- a/src/uncategorized/saRelationships.tw
+++ b/src/uncategorized/saRelationships.tw
@@ -130,7 +130,7 @@
 							<<set _SlaveI.trust -= 4>>
 						<</if>>
 					<</if>>
-				<<elseif (_SlaveJ.ID == $Attendant.ID) && (_SlaveI.assignment == "rest in the spa")>>
+				<<elseif (_SlaveJ.ID == $AttendantID) && (_SlaveI.assignment == "rest in the spa")>>
 					<<if _SlaveJ.rules.relationship != "restrictive">>
 						_SlaveI.slaveName basks in the affection and care of the spa attendant, _SlaveJ.slaveName. The two slaves have @@.lightgreen;struck up a friendship.@@
 						<<set _SlaveJ.relationship = 1, _SlaveJ.relationshipTarget = _SlaveI.ID, _SlaveI.relationship = 1, _SlaveI.relationshipTarget = _SlaveJ.ID>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index b80a36ea620740d8e18eb0455ef2911c07a4d136..58be93c333d93ead38e91a6dfadea546894fe834 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -178,7 +178,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his room<<if $BrothiIDs.length > 1>> with a whore <<if hasBothLegs($slaves[$i])>>between $his legs<<else>>at $his crotch<</if>><</if>>.
 					<</if>>
@@ -570,7 +570,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in the penthouse slave quarters.
 					<</if>>
@@ -769,7 +769,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<elseif (canSee($slaves[$i])) && ($slaves[$i].intelligence+$slaves[$i].intelligenceImplant > 50)>>
 						usually spends relaxing in $his private room reading books.
 					<<elseif (canSee($slaves[$i])) && (canHear($slaves[$i]))>>
@@ -1129,7 +1129,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in the penthouse slave quarters.
 					<</if>>
@@ -1329,7 +1329,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his room amusing $himself with the amenities for recovering slaves.
 					<</if>>
@@ -1735,7 +1735,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his room<<if $CellBiIDs.length > 1>> teaching a disobedient slave how to properly use their mouth<</if>>.
 					<</if>>
@@ -2099,9 +2099,9 @@
 			<<elseif $slaves[$i].energy <= 20>>
 				is frigid and has little interest in getting off.
 				<<set $slaves[$i].need = 0>>
-			<<elseif $Attendant != 0>>
-				is routinely relieved of any built up tension by $Attendant.slaveName and $his
-				<<if canPenetrate($slaves[$i]) && $Attendant.boobs >= 500>>
+			<<elseif _S.Attendant>>
+				is routinely relieved of any built up tension by _S.Attendant.slaveName and $his
+				<<if canPenetrate($slaves[$i]) && _S.Attendant.boobs >= 500>>
 					luscious breasts.
 					<<set $slaves[_FLs].counter.mammary += 14, $mammaryTotal += 14>>
 				<<else>>
@@ -2329,7 +2329,7 @@
 						<<if $SpaiIDs.length > 2>>
 							Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;adores@@ you for providing plentiful outlets for $his nymphomania.
 						<<else>>
-							Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join $him in the pool<<else>>you assign more slaves to $spaName to help $him relieve $his <<if $slaves[$i].balls > 0>>swollen balls<<else>>tension<</if>><</if>>.
+							Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day <<if _S.Attendant>>more of your slaves join $him in the pool<<else>>you assign more slaves to $spaName to help $him relieve $his <<if $slaves[$i].balls > 0>>swollen balls<<else>>tension<</if>><</if>>.
 						<</if>>
 						<<set $slaves[$i].devotion += 1>>
 					<<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>>
@@ -2337,14 +2337,14 @@
 							<<if $SpaiIDs.length > 2>>
 								Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole pool of slaves for $him to rape.
 							<<else>>
-								Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join $him in the pool<<else>>you assign more slaves to $spaName to help $him unwind<</if>>.
+								Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day <<if _S.Attendant>>more of your slaves join $him in the pool<<else>>you assign more slaves to $spaName to help $him unwind<</if>>.
 							<</if>>
 							<<set $slaves[$i].devotion += 1>>
 						<<elseif ($slaves[$i].fetish == "dom")>>
 							<<if $SpaiIDs.length > 2>>
 								Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole pool of slaves for $him to dominate.
 							<<else>>
-								Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day <<if $Attendant != 0>>more of your slaves join $him in the pool<<else>>you assign more slaves to $spaName to help $him unwind<</if>>.
+								Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day <<if _S.Attendant>>more of your slaves join $him in the pool<<else>>you assign more slaves to $spaName to help $him unwind<</if>>.
 							<</if>>
 							<<set $slaves[$i].devotion += 1>>
 						<</if>>
@@ -2355,7 +2355,7 @@
 					<<if $SpaiIDs.length > 2>>
 						Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse.
 					<<else>>
-						Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse. Well, that and the fact $spaName is <<if $Attendant != 0>>mostly frequented by other slaveowners' stock<<else>>$his little private sanctuary<</if>>.
+						Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse. Well, that and the fact $spaName is <<if _S.Attendant>>mostly frequented by other slaveowners' stock<<else>>$his little private sanctuary<</if>>.
 					<</if>>
 					<<set $slaves[$i].trust += 1>>
 				<</if>>
@@ -2402,7 +2402,7 @@
 			<<if _rewards > 0>>
 				<<switch $slaves[$i].rules.reward>>
 				<<case "relaxation">>
-					$He's given free time, which $he usually spends in a private bath<<if $Attendant != 0>>, enjoying $Attendant.slaveName's best care<</if>>.
+					$He's given free time, which $he usually spends in a private bath<<if $AttendantID != 0>>, enjoying _S.Attendant.slaveName's best care<</if>>.
 					<<if $slaves[$i].relationship > 0>>
 						<<set $subSlave = getSlave($slaves[$i].relationshipTarget)>>
 						<<if def $subSlave>>
@@ -2941,7 +2941,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in the penthouse slave quarters.
 					<</if>>
@@ -3150,7 +3150,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if $AttendantID != 0>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his room<<if $SchlRiIDs.length > 1>> giving private lessons to a student<</if>>.
 					<</if>>
@@ -3482,7 +3482,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his dorm room.
 					<</if>>
@@ -3681,7 +3681,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his room<<if $ServQiIDs.length > 1>> while enjoying some service from $his underlings<</if>>.
 					<</if>>
@@ -4015,7 +4015,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in the penthouse slave quarters.
 					<</if>>
@@ -4208,7 +4208,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his room<<if $DairyiIDs.length > 1>> with the softest cow available<</if>>.
 					<</if>>
@@ -4605,7 +4605,7 @@
 						<<case "relaxation">>
 							$He's given free time, which $he
 							<<if $spa != 0>>
-								usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+								usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 							<<else>>
 								usually spends relaxing in the penthouse slave quarters.
 							<</if>>
@@ -4799,7 +4799,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in $his room<<if $FarmyardiIDs.length > 1>> with the softest cow available<</if>>.
 					<</if>>
@@ -5178,7 +5178,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in the penthouse slave quarters.
 					<</if>>
@@ -5406,7 +5406,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing on $his favorite pillow.
 					<</if>>
@@ -5557,7 +5557,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in your Head Girl's private room.
 					<</if>>
@@ -6027,7 +6027,7 @@
 				<<case "relaxation">>
 					$He's given free time, which $he
 					<<if $spa != 0>>
-						usually spends in $spaName<<if $Attendant != 0>>, enjoying $Attendant.slaveName's care<</if>>.
+						usually spends in $spaName<<if _S.Attendant>>, enjoying _S.Attendant.slaveName's care<</if>>.
 					<<else>>
 						usually spends relaxing in the slave quarters.
 					<</if>>
diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 5e698ada3312be015f4e3dbd47787c37993515bf..dc673d304ae406b0b968a77ce7f1669dc706bd86 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -7,8 +7,8 @@
 /*Spa room*/
 <<if $spa > 0>>
 	<<set $spaSpots = ($spa - $SpaiIDs.length) * 20>>
-	<<if $Attendant != 0>>
-		<<set $spaSpots = Math.trunc($spaSpots * (1 + ($Attendant.skill.attendant / 400)))>> /*A skilled attendant improves available space by 25%*/
+	<<if _S.Attendant>>
+		<<set $spaSpots = Math.trunc($spaSpots * (1 + (_S.Attendant.skill.attendant / 400)))>> /*A skilled attendant improves available space by 25%*/
 	<</if>>
 <</if>>
 
@@ -703,24 +703,23 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 		<<= removeJob($slaves[$i], "be the Wardeness")>>
 	<</if>>
 <<case "be the Attendant">>
-	<<set $Attendant = $slaves[$i]>>
-	<<if $Attendant.fetish == "mindbroken">>
-		<span class='slave-name'>$Attendant.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Attendant any more.@@<br>
-		<<set $Attendant = 0>>
-	<<elseif $Attendant.preg > 37 && $Attendant.broodmother == 2>>
-		<span class='slave-name'>$Attendant.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Attendant any longer.@@
-		<<set $Attendant = 0>>
-	<<elseif !canWalk($Attendant)>>
-		<span class='slave-name'>$Attendant.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Attendant any more.@@<br>
-		<<set $Attendant = 0>>
-	<<elseif !canHold($Attendant)>>
-		<span class='slave-name'>$Attendant.slaveName</span> can no longer support $his charges @@.yellow;and cannot serve as your Attendant any more.@@<br>
-		<<set $Attendant = 0>>
-	<<elseif !canHear($Attendant)>>
-		<span class='slave-name'>$Attendant.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Attendant any more.@@<br>
-		<<set $Attendant = 0>>
+	<<if _S.Attendant.fetish == "mindbroken">>
+		<span class='slave-name'>_S.Attendant.slaveName</span> is mindbroken @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<<set $AttendantID = 0>>
+	<<elseif _S.Attendant.preg > 37 && _S.Attendant.broodmother == 2>>
+		<span class='slave-name'>_S.Attendant.slaveName</span> spends so much time giving birth and laboring that @@.yellow;$he cannot effectively serve as your Attendant any longer.@@
+		<<set $AttendantID = 0>>
+	<<elseif !canWalk(_S.Attendant)>>
+		<span class='slave-name'>_S.Attendant.slaveName</span> is no longer independently mobile @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<<set $AttendantID = 0>>
+	<<elseif !canHold(_S.Attendant)>>
+		<span class='slave-name'>_S.Attendant.slaveName</span> can no longer support $his charges @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<<set $AttendantID = 0>>
+	<<elseif !canHear(_S.Attendant)>>
+		<span class='slave-name'>_S.Attendant.slaveName</span> can no longer hear @@.yellow;and cannot serve as your Attendant any more.@@<br>
+		<<set $AttendantID = 0>>
 	<</if>>
-	<<if $Attendant == 0>>
+	<<if $AttendantID == 0>>
 		<<= removeJob($slaves[$i], "be the Attendant")>>
 	<</if>>
 <<case "be the Matron">>
@@ -1073,7 +1072,7 @@ $sexDemandResult.topClass = Math.trunc((($NPCSexSupply.topClass + $slaveJobValue
 	["Dairy Report", $dairyNameCaps, $dairy, $DairyiIDs.length, $Milkmaid, "Milkmaid"],
 	["Farmyard Report", $farmyardNameCaps, $farmyard, $FarmyardiIDs.length, $Farmer, "Farmer"],
 	["Schoolroom Report", $schoolroomNameCaps, $schoolroom, $SchlRiIDs.length, $Schoolteacher, "Schoolteacher"],
-	["Spa Report", $spaNameCaps, $spa, $SpaiIDs.length, $Attendant, "Attendant"],
+	["Spa Report", $spaNameCaps, $spa, $SpaiIDs.length, $AttendantID, "Attendant"],
 	["Nursery Report", $nurseryNameCaps, $nurseryNannies, $NurseryiIDs.length, $Matron, "Matron"],
 	["Servants' Quarters Report", $servantsQuartersNameCaps, $servantsQuarters, $ServQiIDs.length, $Stewardess, "Stewardess"],
 	["Children Report", "Nursery Children", $nursery, $nurseryBabies, -1, -1],
diff --git a/src/uncategorized/spa.tw b/src/uncategorized/spa.tw
index 331b703c812938e145627d647ab1de2c4827e3fe..0b0c95cdaa65706a88657e2f1c43a48993b3d348 100644
--- a/src/uncategorized/spa.tw
+++ b/src/uncategorized/spa.tw
@@ -79,13 +79,13 @@
 		It's busy in here. Slaves are relaxing in the warm water, splashing around or just floating. Here and there some of the more sex-starved are in the early stages of intercourse, but most prefer to take time off from it all.
 	<<elseif $SpaiIDs.length > 0>>
 		It's sparsely populated; though the few slaves here have little company they like having the water to themselves.
-	<<elseif $Attendant != 0>>
-		<<setLocalPronouns $Attendant>>
-		$Attendant.slaveName is alone here, and has nothing to do but keep the place (and $his own soft, wet body) spotlessly clean.
+	<<elseif _S.Attendant>>
+		<<setLocalPronouns _S.Attendant>>
+		_S.Attendant.slaveName is alone here, and has nothing to do but keep the place (and $his own soft, wet body) spotlessly clean.
 	<<else>>
 		It's empty and quiet.
 	<</if>>
-	<<if $SpaiIDs.length == 0 && $Attendant == 0>>
+	<<if $SpaiIDs.length == 0 && !_S.Attendant>>
 		<div class="choices" style="font-style:normal">
 			[[Decommission the Spa|Main][$spa = 0, $spaDecoration = "standard", $spaUpgrade = 0, $spaFix = 0]]
 		</div>
@@ -123,22 +123,22 @@
 	<</if>>
 </div>
 <div>
-	<<if $Attendant != 0>>
-		<<setLocalPronouns $Attendant>>
+	<<if _S.Attendant>>
+		<<setLocalPronouns _S.Attendant>>
 		<<if $spaFix == 2>>
-			$Attendant.slaveName is focusing only on the health and wellness of the slaves under $his care, obeying your orders to avoid attempting to right mental flaws.
+			_S.Attendant.slaveName is focusing only on the health and wellness of the slaves under $his care, obeying your orders to avoid attempting to right mental flaws.
 			<div class="choices">
 				[["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]] |
 				[["Let " + $him + " tend as " + $he + " sees fit"|Spa][$spaFix = 0]]
 			</div>
 		<<elseif $spaFix == 1>>
-			$Attendant.slaveName is focusing on the health and wellness of the slaves under $his care, as well as trying to bring mindbroken slaves back, while ignoring any mental hang-ups a slave may have.
+			_S.Attendant.slaveName is focusing on the health and wellness of the slaves under $his care, as well as trying to bring mindbroken slaves back, while ignoring any mental hang-ups a slave may have.
 			<div class="choices">
 				[["Order " + $him + " to not fix flaws"|Spa][$spaFix = 2]] |
 				[["Let " + $him + " tend as " + $he + " sees fit"|Spa][$spaFix = 0]]
 			</div>
 		<<else>>
-			$Attendant.slaveName is not following any special orders and is tending to your slaves as $he sees fit.
+			_S.Attendant.slaveName is not following any special orders and is tending to your slaves as $he sees fit.
 			<div class="choices">
 				[["Order " + $him + " to not fix any flaws"|Spa][$spaFix = 2]] |
 				[["Order " + $him + " to only fix mindbroken slaves"|Spa][$spaFix = 1]]
diff --git a/src/uncategorized/spaReport.tw b/src/uncategorized/spaReport.tw
index 8fc24f3787f51c90b5873ed51e6f82aa88192f69..7fce7569df70245aad24118c67939bfd97284699 100644
--- a/src/uncategorized/spaReport.tw
+++ b/src/uncategorized/spaReport.tw
@@ -9,75 +9,73 @@
 	<<set _devBonus = 0>>
 <</if>>
 
-<<if $Attendant != 0>>
-	<<set _FLs = $slaveIndices[$Attendant.ID]>>
-
-	<<if ($slaves[_FLs].health.condition < 100)>>
-		<<run improveCondition($slaves[_FLs], normalRandInt(20))>>
+<<if $AttendantID != 0>>
+	<<if (_S.Attendant.health.condition < 100)>>
+		<<run improveCondition(_S.Attendant, normalRandInt(20))>>
 	<</if>>
-	<<if ($slaves[_FLs].devotion <= 60)>>
-		<<set $slaves[_FLs].devotion++>>
+	<<if (_S.Attendant.devotion <= 60)>>
+		<<set _S.Attendant.devotion++>>
 	<</if>>
-	<<if $slaves[_FLs].trust < 60>>
-		<<set $slaves[_FLs].trust++>>
+	<<if _S.Attendant.trust < 60>>
+		<<set _S.Attendant.trust++>>
 	<</if>>
-	<<if $slaves[_FLs].rules.living != "luxurious">>
-		<<set $slaves[_FLs].rules.living = "luxurious">>
+	<<if _S.Attendant.rules.living != "luxurious">>
+		<<set _S.Attendant.rules.living = "luxurious">>
 	<</if>>
 	<<set _FLsFetish = 0>>
-	<<if $slaves[_FLs].fetishStrength <= 95>>
-		<<if $slaves[_FLs].fetish != "submissive">>
-			<<if fetishChangeChance($slaves[_FLs]) > random(0,100)>>
-				<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1, $slaves[_FLs].fetish = "submissive">>
+	<<if _S.Attendant.fetishStrength <= 95>>
+		<<if _S.Attendant.fetish != "submissive">>
+			<<if fetishChangeChance(_S.Attendant) > random(0,100)>>
+				<<set _FLsFetish = 1, _S.Attendant.fetishKnown = 1, _S.Attendant.fetish = "submissive">>
 			<</if>>
-		<<elseif $slaves[_FLs].fetishKnown == 0>>
-			<<set _FLsFetish = 1, $slaves[_FLs].fetishKnown = 1>>
+		<<elseif _S.Attendant.fetishKnown == 0>>
+			<<set _FLsFetish = 1, _S.Attendant.fetishKnown = 1>>
 		<<else>>
-			<<set _FLsFetish = 2, $slaves[_FLs].fetishStrength += 4>>
+			<<set _FLsFetish = 2, _S.Attendant.fetishStrength += 4>>
 		<</if>>
 	<</if>>
-	<<if ($Attendant.fetish == "none") || ($Attendant.fetish == "submissive")>>
+	<<if (_S.Attendant.fetish == "none") || (_S.Attendant.fetish == "submissive")>>
 		<<set _devBonus++>>
 	<</if>>
-	<<set $slaves[_FLs].devotion += _devBonus, $Attendant = $slaves[_FLs]>>
-	<<setLocalPronouns $Attendant>>
-	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName($Attendant)>> is serving as the spa attendant.<<if $Attendant.relationship == -3 && $Attendant.devotion > 50>> $He tries $his best to be your perfect attentive, caring and loving $wife.<</if>>
+	<<set _S.Attendant.devotion += _devBonus>>
+	<<setLocalPronouns _S.Attendant>>
+	&nbsp;&nbsp;&nbsp;&nbsp;<<= SlaveFullName(_S.Attendant)>> is serving as the spa attendant.<<if _S.Attendant.relationship == -3 && _S.Attendant.devotion > 50>> $He tries $his best to be your perfect attentive, caring and loving $wife.<</if>>
 	<<if (_FLsFetish == 1)>>
 		When $he is paid a visit by a slave with sexual issues to work out, $he provides them with an understanding, willing, giving partner. $He finds real satisfaction in helping your slaves find sexual gratification, and @@.lightsalmon;becomes a submissive.@@
 	<<elseif (_FLsFetish == 2)>>
 		Every new slave in the spa is a new person $he gets to connect with and serve. Sexually. @@.lightsalmon;$He becomes more submissive.@@
 	<</if>>
-	<<if setup.attendantCareers.includes($Attendant.career)>>
+	<<if setup.attendantCareers.includes(_S.Attendant.career)>>
 		$He has experience with counseling from $his life before $he was a slave, making $him better at building rapport with troubled slaves, and giving $him a better chance of softening flaws into beneficial quirks.
 		<<set _bonusToggle = 1, _idleBonus++>>
-	<<elseif $Attendant.skill.attendant >= $masteredXP>>
+	<<elseif _S.Attendant.skill.attendant >= $masteredXP>>
 		$He has experience with counseling from working for you, making $him better at building rapport with troubled slaves, and giving $him a better chance of softening flaws into beneficial quirks.
 		<<set _bonusToggle = 1, _idleBonus++>>
 	<<else>>
-		<<set $slaves[_FLs].skill.attendant += random(1,Math.ceil(($Attendant.intelligence+$Attendant.intelligenceImplant)/15) + 8)>>
+		<<set _S.Attendant.skill.attendant += random(1,Math.ceil((_S.Attendant.intelligence+_S.Attendant.intelligenceImplant)/15) + 8)>>
 	<</if>>
-	<<if !canSee($Attendant)>>
+	<<if !canSee(_S.Attendant)>>
 		$His blindness allows $him to deeply connect with $his charges.
 		<<set _idleBonus++>>
 	<</if>>
-	<<if ($Attendant.fetish == "none")>>
-		$Attendant.slaveName respects the slaves lounging in the spa, allowing them to relax completely.
+	<<if (_S.Attendant.fetish == "none")>>
+		_S.Attendant.slaveName respects the slaves lounging in the spa, allowing them to relax completely.
 		<<set _idleBonus++>>
-	<<elseif ($Attendant.fetish == "submissive")>>
-		$Attendant.slaveName lets the slaves resting in the spa take the lead sexually, doing $his best to please them.
+	<<elseif (_S.Attendant.fetish == "submissive")>>
+		_S.Attendant.slaveName lets the slaves resting in the spa take the lead sexually, doing $his best to please them.
 		<<set _idleBonus++>>
-	<<elseif ($Attendant.fetishKnown == 1)>>
-		$Attendant.slaveName can't keep $his hand<<if hasBothArms($Attendant)>>s<</if>> to $himself, preventing the slaves in the spa from relaxing completely.
+	<<elseif (_S.Attendant.fetishKnown == 1)>>
+		_S.Attendant.slaveName can't keep $his hand<<if hasBothArms(_S.Attendant)>>s<</if>> to $himself, preventing the slaves in the spa from relaxing completely.
 	<</if>>
-	<<if ($Attendant.visualAge > 35)>>
+	<<if (_S.Attendant.visualAge > 35)>>
 		$His apparent maturity encourages the slaves in the spa to relax and pour out their troubles to $him.
 		<<set _healthBonus++, _idleBonus++>>
 	<</if>>
-	<<if ($Attendant.intelligence+$Attendant.intelligenceImplant > 15)>>
+	<<if (_S.Attendant.intelligence+_S.Attendant.intelligenceImplant > 15)>>
 		$He's so intelligent $he can suss out the cause of slaves' emotional issues and counsel them effectively.
 		<<set _idleBonus++>>
 	<</if>>
-	<<if isFertile($Attendant) || ($Attendant.bellyPreg >= 1500) || ($Attendant.counter.birthsTotal > 0) || ($Attendant.bellyImplant >= 1500)>>
+	<<if isFertile(_S.Attendant) || (_S.Attendant.bellyPreg >= 1500) || (_S.Attendant.counter.birthsTotal > 0) || (_S.Attendant.bellyImplant >= 1500)>>
 		$He has a natural mothering instinct and really makes $his charges feel at home.
 		<<set _idleBonus++, _healthBonus++>>
 	<</if>>
@@ -87,8 +85,8 @@
 		<<setLocalPronouns $slaves[$i] 2>>
 		<<if ($slaves[$i].fetish == "mindbroken") && ($slaves[$i].health.condition > 20) && (_attendantUsedCure == 0) && ($spaFix != 2)>>
 			<<set _attendantUsedCure = 1>>
-			<<if (random(1,100) > 90-$Attendant.devotion)>>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;@@.green;Something almost miraculous has happened.@@ $Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on _him2 in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from _his2 mental torpor.
+			<<if (random(1,100) > 90-_S.Attendant.devotion)>>
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;@@.green;Something almost miraculous has happened.@@ _S.Attendant.slaveName has always refused to believe that $slaves[$i].slaveName could not be reached, and has lavished patient tenderness on _him2 in $spaName. $slaves[$i].slaveName has begun to respond, and is stirring from _his2 mental torpor.
 				<<set $slaves[$i].devotion = -3, $slaves[$i].sexualFlaw = "apathetic", $slaves[$i].behavioralFlaw = either("hates men", "odd"), $slaves[$i].fetish = "none", $slaves[$i].fetishKnown = 1>>
 				<<set _spr = $genePool.findIndex(function(s) { return s.ID == $slaves[$i].ID; })>>
 				<<if $genePool[_spr].intelligence >= -95>>
@@ -105,17 +103,17 @@
 		<<if _bonusToggle == 1 && $slaves[$i].trust < 60>>
 			<<set $slaves[$i].trust++>>
 		<</if>>
-		<<if $Attendant.rivalryTarget == $slaves[$i].ID>>
-			$He constantly harasses $his <<print rivalryTerm($Attendant)>>, $slaves[$i].slaveName, preventing _him2 from getting comfortable and forcing _him2 to keep _his2 guard up.
+		<<if _S.Attendant.rivalryTarget == $slaves[$i].ID>>
+			$He constantly harasses $his <<print rivalryTerm(_S.Attendant)>>, $slaves[$i].slaveName, preventing _him2 from getting comfortable and forcing _him2 to keep _his2 guard up.
 			<<set $slaves[$i].devotion -= 4, $slaves[$i].trust -= 4>>
 			<<if random(1,100) > 35>>
-				<<set $Attendant.rivalry++, $slaves[_FLs].rivalry++, $slaves[$i].rivalry++>>
+				<<set _S.Attendant.rivalry++, _S.Attendant.rivalry++, $slaves[$i].rivalry++>>
 			<</if>>
-		<<elseif $Attendant.relationshipTarget == $slaves[$i].ID>>
-			$He dedicates most of $his attention to $his <<print relationshipTerm($Attendant)>>, $slaves[$i].slaveName, making _his2 stress, both physical and mental, wash away.
+		<<elseif _S.Attendant.relationshipTarget == $slaves[$i].ID>>
+			$He dedicates most of $his attention to $his <<print relationshipTerm(_S.Attendant)>>, $slaves[$i].slaveName, making _his2 stress, both physical and mental, wash away.
 			<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
-		<<elseif areRelated($Attendant, $slaves[$i])>>
-			$He makes sure to spend extra time caring for $his <<print relativeTerm($Attendant,$slaves[$i])>>, $slaves[$i].slaveName.
+		<<elseif areRelated(_S.Attendant, $slaves[$i])>>
+			$He makes sure to spend extra time caring for $his <<print relativeTerm(_S.Attendant,$slaves[$i])>>, $slaves[$i].slaveName.
 			<<set $slaves[$i].trust++>>
 			<<run improveCondition($slaves[$i], 1)>>
 		<</if>>
@@ -133,47 +131,47 @@
 			<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
 		<<case "$He is remembered for winning best in show as a cockmilker.">>
 			<<if ($slaves[$i].balls > 6) && ($slaves[$i].dick != 0)>>
-				<<if $Attendant.fetish == "cumslut">>
-					$He can't keep $his hand<<if hasBothArms($Attendant)>>s<</if>> off $slaves[$i].slaveName's cock and balls, but _he2 doesn't mind being milked constantly. Before long, strands of cum can be found floating all throughout the bath.
-					<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
+				<<if _S.Attendant.fetish == "cumslut">>
+					$He can't keep $his hand<<if hasBothArms(_S.Attendant)>>s<</if>> off $slaves[$i].slaveName's cock and balls, but _he2 doesn't mind being milked constantly. Before long, strands of cum can be found floating all throughout the bath.
+					<<set _S.Attendant.fetishStrength += 4>>
 				<<else>>
 					$He does $his best to accommodate $slaves[$i].slaveName's massive genitals and tends to _him2 whenever _he2 feels a need for release.
-					<<if random(1,100) > 65 && $Attendant.fetish == "none">>
-						After taking several massive loads to the face, $Attendant.slaveName begins to find satisfaction in being coated in cum.
-						<<set $Attendant.fetish = "cumslut", $slaves[_FLs].fetish = "cumslut">>
+					<<if random(1,100) > 65 && _S.Attendant.fetish == "none">>
+						After taking several massive loads to the face, _S.Attendant.slaveName begins to find satisfaction in being coated in cum.
+						<<set _S.Attendant.fetish = "cumslut">>
 					<</if>>
 				<</if>>
 			<</if>>
 			<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
 		<<case "$He is remembered for winning best in show as a dairy cow.">>
 			<<if ($slaves[$i].lactation > 0) && (($slaves[$i].boobs-$slaves[$i].boobsImplant) > 6000)>>
-				<<if $Attendant.fetish == "boobs">>
-					$He can't keep $his hand<<if hasBothArms($Attendant)>>s<</if>> off $slaves[$i].slaveName's huge breasts, but _he2 doesn't mind being milked constantly. Before long the bath gains a white tint.
-					<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
+				<<if _S.Attendant.fetish == "boobs">>
+					$He can't keep $his hand<<if hasBothArms(_S.Attendant)>>s<</if>> off $slaves[$i].slaveName's huge breasts, but _he2 doesn't mind being milked constantly. Before long the bath gains a white tint.
+					<<set _S.Attendant.fetishStrength += 4, _S.Attendant.fetishStrength += 4>>
 				<<else>>
 					$He does $his best to accommodate $slaves[$i].slaveName's massive breasts and tends to _him2 whenever _he2 feels a need for release.
-					<<if random(1,100) > 65 && $Attendant.fetish == "none">>
-						After multiple milking sessions, $Attendant.slaveName begins to find $himself fantasizing about having giant milky breasts too.
-						<<set $Attendant.fetish = "boobs", $slaves[_FLs].fetish = "boobs">>
+					<<if random(1,100) > 65 && _S.Attendant.fetish == "none">>
+						After multiple milking sessions, _S.Attendant.slaveName begins to find $himself fantasizing about having giant milky breasts too.
+						<<set _S.Attendant.fetish = "boobs">>
 					<</if>>
 				<</if>>
 				<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3, $slaves[$i].lactationDuration = 2, $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>>
 			<</if>>
 		<<case "$He is remembered for winning best in show as a breeder.">>
 			<<if $slaves[$i].bellyPreg >= 5000>>
-				<<if $Attendant.fetish == "pregnancy">>
-					$He can't keep $his hand<<if hasBothArms($Attendant)>>s<</if>> off $slaves[$i].slaveName's pregnancy, but _he2 doesn't mind _his2 full belly being fondled.
-					<<set $Attendant.fetishStrength += 4, $slaves[_FLs].fetishStrength += 4>>
+				<<if _S.Attendant.fetish == "pregnancy">>
+					$He can't keep $his hand<<if hasBothArms(_S.Attendant)>>s<</if>> off $slaves[$i].slaveName's pregnancy, but _he2 doesn't mind _his2 full belly being fondled.
+					<<set _S.Attendant.fetishStrength += 4, _S.Attendant.fetishStrength += 4>>
 				<<else>>
 					$He does $his best to accommodate $slaves[$i].slaveName's pregnancy and to make sure the mother-to-be is happy and comfortable.
-					<<if random(1,100) > 65 && $Attendant.fetish == "none">>
-						After massaging $slaves[$i].slaveName's growing belly multiple times, $Attendant.slaveName begins to find $himself fantasizing about being swollen with life too.
-						<<set $Attendant.fetish = "pregnancy", $slaves[_FLs].fetish = "pregnancy">>
+					<<if random(1,100) > 65 && _S.Attendant.fetish == "none">>
+						After massaging $slaves[$i].slaveName's growing belly multiple times, _S.Attendant.slaveName begins to find $himself fantasizing about being swollen with life too.
+						<<set _S.Attendant.fetish = "pregnancy">>
 					<</if>>
 				<</if>>
 				<<set $slaves[$i].devotion += 3, $slaves[$i].trust += 3>>
 			<<else>>
-				<<if $Attendant.fetish == "pregnancy">>
+				<<if _S.Attendant.fetish == "pregnancy">>
 					$He can't help but pester $slaves[$i].slaveName with questions about _his2 famous pregnancy, limiting _his2 ability to truly relax.
 					<<set $slaves[$i].devotion += 1, $slaves[$i].trust += 1>>
 				<<elseif canGetPregnant($slaves[$i])>>
@@ -182,25 +180,25 @@
 				<</if>>
 			<</if>>
 		<</switch>>
-		<<if ($Attendant.intelligence+$Attendant.intelligenceImplant > 15) && (_attendantUsedCure == 0) && (($Attendant.intelligence+$Attendant.intelligenceImplant)+_seed) > random(1,200) && ($spaFix == 0)>>
+		<<if (_S.Attendant.intelligence+_S.Attendant.intelligenceImplant > 15) && (_attendantUsedCure == 0) && ((_S.Attendant.intelligence+_S.Attendant.intelligenceImplant)+_seed) > random(1,200) && ($spaFix == 0)>>
 			<<if $slaves[$i].behavioralFlaw != "none">>
 				<<run SoftenBehavioralFlaw($slaves[$i])>>
 				<<set _attendantUsedCure += 1>>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;$Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens _his2 behavioral flaw@@ into an appealing quirk.
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;_S.Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens _his2 behavioral flaw@@ into an appealing quirk.
 			<<elseif $slaves[$i].sexualFlaw != "none">>
 				<<run SoftenSexualFlaw($slaves[$i])>>
 				<<set _attendantUsedCure += 1>>
-				<br>&nbsp;&nbsp;&nbsp;&nbsp;$Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens _his2 sexual flaw@@ into an appealing quirk.
+				<br>&nbsp;&nbsp;&nbsp;&nbsp;_S.Attendant.slaveName works carefully with $slaves[$i].slaveName, and successfully @@.green;softens _his2 sexual flaw@@ into an appealing quirk.
 			<</if>>
 		<</if>>
 		<<if $slaves[$i].lactation > 0>>
-			$Attendant.slaveName takes care to keep $slaves[$i].slaveName's breasts comfortably drained.
+			_S.Attendant.slaveName takes care to keep $slaves[$i].slaveName's breasts comfortably drained.
 			<<set $slaves[$i].lactationDuration = 2, $slaves[$i].boobs -= $slaves[$i].boobsMilk, $slaves[$i].boobsMilk = 0>>
 		<</if>>
 	<</for>>
 	<<if (_DL < $spa)>>
 		<<set _seed = random(1,10)+(($spa-_DL)*(random(150,170)+(_idleBonus*10)))>>
-		<<run cashX(_seed, "spa", $Attendant)>>
+		<<run cashX(_seed, "spa", _S.Attendant)>>
 		<br>&nbsp;&nbsp;&nbsp;&nbsp;Since $he doesn't have enough slaves to occupy all $his time, the spa takes in citizens' slaves on a contract basis and $he helps them too, earning @@.yellowgreen;<<print cashFormat(_seed)>>.@@
 		<<if ($arcologies[0].FSHedonisticDecadence > 0) && (_DL == 0)>>
 			Society @@.green;loves@@ being allowed to lounge in your spa, greatly advancing your laid back culture.
@@ -218,14 +216,14 @@
 	<</if>>
 <</if>>
 
-<<if $Attendant != 0>>
+<<if _S.Attendant>>
 	<<set $i = _FLs>> /* apply following SA passages to facility leader */
 	<<if $showEWD != 0>>
 		<br><br>
 		/* 000-250-006 */
 		<<if $seeImages && $seeReportImages>>
 		<div class="imageRef smlImg">
-			<<= SlaveArt($slaves[_FLs], 0, 0)>>
+			<<= SlaveArt(_S.Attendant, 0, 0)>>
 		</div>
 		<</if>>
 		/* 000-250-006 */
@@ -253,7 +251,6 @@
 		<<include "SA devotion">>
 		<</silently>>
 	<</if>>
-	<<set $Attendant = $slaves[_FLs]>>
 <</if>>
 
 <<for _dI = 0; _dI < _DL; _dI++>>
@@ -373,6 +370,6 @@
 		<br><br>&nbsp;&nbsp;&nbsp;&nbsp;$spaNameCaps's $spaDecoration atmosphere @@.hotpink;had an impact on <<if _restedSlaves == 1>>$him while $he was<<else>>them while they were<</if>>@@ resting.
 	<</if>>
 <</if>>
-<<if _DL > 0 || $Attendant != 0>>
+<<if _DL > 0 || _S.Attendant>>
 	<br><br>
 <</if>>
diff --git a/src/utility/birthWidgets.tw b/src/utility/birthWidgets.tw
index fe935499eba35882645aae49f9438378080f4438..c9d05aa1ffcf19f7379f008ff7a719db9e93ed4e 100644
--- a/src/utility/birthWidgets.tw
+++ b/src/utility/birthWidgets.tw
@@ -248,9 +248,9 @@
 
 <<case "rest in the spa">>
 	<<if $slaves[$i].fetish == "mindbroken">>
-		<<if $Attendant != 0>>$Attendant.slaveName leads $him to a special pool designed to give birth in. Once $he is safely in the water alongside $Attendant.slaveName,<<else>>$He is lead to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to $his watching helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
+		<<if _S.Attendant>>_S.Attendant.slaveName leads $him to a special pool designed to give birth in. Once $he is safely in the water alongside _S.Attendant.slaveName,<<else>>$He is lead to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, indifferent to $his watching helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
 	<<else>>
-		<<if $Attendant != 0>>$Attendant.slaveName escorts $him to a special pool designed to give birth in. Once $he is safely in the water alongside $Attendant.slaveName,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, aided by $his helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
+		<<if _S.Attendant>>_S.Attendant.slaveName escorts $him to a special pool designed to give birth in. Once $he is safely in the water alongside _S.Attendant.slaveName,<<else>>$He is escorted to a special pool designed to give birth in. Once $he is safely in the water alongside $his assistant,<</if>> $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, aided by $his helper. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he is taken back to the spa.
 	<</if>>
 
 <<case "work as a nanny">> /* TODO: write a description for this */
@@ -350,7 +350,7 @@
 	$He heads to a private room in the back of the club accompanied by an influential patron. $He settles $himself onto his lap and begins working on birthing $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, basking in his attention. Placing $his child<<if $slaves[$i].pregType > 1>>ren<</if>> outside the room, $he returns to pleasure $his tease.
 
 <<case "be the Attendant">>
-	$Attendant.slaveName waddles to a special pool designed to give birth in. Once $he is safely in the water, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, something $he has been trained for. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he heads back to the main pool.
+	_S.Attendant.slaveName waddles to a special pool designed to give birth in. Once $he is safely in the water, $he begins to push out $his bab<<if $slaves[$i].pregType > 1>>ies<<else>>y<</if>>, something $he has been trained for. $His child<<if $slaves[$i].pregType > 1>>ren are<<else>> is<</if>> promptly taken and, following a cleaning, $he heads back to the main pool.
 
 <<case "be the Matron">>
 	//This needs a description//
@@ -1006,25 +1006,25 @@
 <<case "rest in the spa">>
 	<<if !canWalk($slaves[$i])>>
 		<<if $slaves[$i].fetish == "mindbroken">>
-			While soaking in the spa's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if $Attendant != 0>>$Attendant.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
+			While soaking in the spa's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if _S.Attendant>>_S,Attendant.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
 			<<ClothingBirth>>
 			$He and $his child<<if $slaves[$i].pregType > 1>>ren<</if>> are quickly dried off as $he begins nursing them. A servant soon arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away.
 		<<else>>
 			While changing in the changing room before a nice soak,$slaves[$i].slaveName's water breaks. $He hurries to find someone to help $him but only finds curious onlookers. Without any choice left, $he assumes a birthing position.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> while the rest finish pleasuring themselves from the show. <<if $Attendant != 0>>$Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is helped into the bath to clean up and relax<</if>>.
+			Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> while the rest finish pleasuring themselves from the show. <<if _S.Attendant>>_S.Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is helped into the bath to clean up and relax<</if>>.
 		<</if>>
 	<<else>>
 		<<if $slaves[$i].fetish == "mindbroken">>
-			While soaking in the spa's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if $Attendant != 0>>$Attendant.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
+			While soaking in the spa's pool, $slaves[$i].slaveName's water breaks. As $he begins to ready $himself for birth, <<if _S.Attendant>>_S.Attendant.slaveName pulls $him out of the pool and glares at $him<<else>>the other bathers watch curiously<</if>>.
 			<<ClothingBirth>>
 			$He and $his child<<if $slaves[$i].pregType > 1>>ren<</if>> are quickly dried off as $he begins nursing them. A servant soon arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away.
 		<<else>>
 			While heading for the changing room before a nice soak,$slaves[$i].slaveName's water breaks. $He hurries into the changing room only to find it unusually crowded. Without any choice left, $he assumes a birthing position.
 			<<set $humiliation = 1>>
 			<<ClothingBirth>>
-			Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> while the rest finish pleasuring themselves from the show. <<if $Attendant != 0>>$Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into the bath to clean up and relax<</if>>.
+			Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> while the rest finish pleasuring themselves from the show. <<_S.Attendant>>_S.Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into the bath to clean up and relax<</if>>.
 		<</if>>
 	<</if>>
 
@@ -1032,7 +1032,7 @@
 	While heading for the changing room before a nice soak,$slaves[$i].slaveName's water breaks. $He hurries into the changing room only to find it unusually crowded. Without any choice left, $he assumes a birthing position.
 	<<set $humiliation = 1>>
 	<<ClothingBirth>>
-	Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> while the rest finish pleasuring themselves from the show. <<if $Attendant != 0>>$Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into the bath to clean up and relax<</if>>.
+	Several of the other slaves present help $him with $his newborn<<if $slaves[$i].pregType > 1>>s<</if>> while the rest finish pleasuring themselves from the show. <<if _S.Attendant>>_S.Attendant.slaveName, lured in by the commotion, shoos the other slaves out and helps the new mother to a private relaxation room to unwind<<else>>Soon a servant arrives to take $his child<<if $slaves[$i].pregType > 1>>ren<</if>> away, and $he is ushered into the bath to clean up and relax<</if>>.
 
 <<case "learn in the schoolroom">>
 	<<if ($Schoolteacher != 0)>>
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index d6d7a9d78c00bb88fd7ed9e0c57fa4281cb6fca9..dc2107dae4b73938cc5313db292097404496adf9 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -763,7 +763,7 @@ $activeSlave.slaveName is
 	$His uniform is pinned with the
 	<<if ($activeSlave.ID == $Bodyguard.ID) || ($activeSlave.ID == $HeadGirl.ID) || ($activeSlave.ID == $Recruiter.ID) || ($activeSlave.ID == $Concubine.ID)>>
 		golden whip and manacles insignia of a senior slave officer,
-	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
+	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $AttendantID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
 		golden manacles insignia of a junior slave officer,
 	<<elseif ($activeSlave.skill.combat > 0) && getLimbCount($activeSlave, 105) > 0>>
 		silver spear and manacles insignia of an augmented slave soldier,
@@ -785,7 +785,7 @@ $activeSlave.slaveName is
 	$His uniform is pinned with the
 	<<if ($activeSlave.ID == $Bodyguard.ID) || ($activeSlave.ID == $HeadGirl.ID) || ($activeSlave.ID == $Recruiter.ID) || ($activeSlave.ID == $Concubine.ID)>>
 		golden whip and manacles insignia of a senior slave officer,
-	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
+	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $AttendantID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
 		golden manacles insignia of a junior slave officer,
 	<<elseif ($activeSlave.skill.combat > 0) && getLimbCount($activeSlave, 105)>>
 		silver spear and manacles insignia of an augmented slave soldier,
@@ -807,7 +807,7 @@ $activeSlave.slaveName is
 	$His uniform is pinned with the
 	<<if ($activeSlave.ID == $Bodyguard.ID) || ($activeSlave.ID == $HeadGirl.ID) || ($activeSlave.ID == $Recruiter.ID) || ($activeSlave.ID == $Concubine.ID)>>
 		golden whip and manacles insignia of a senior slave officer,
-	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
+	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $AttendantID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
 		golden manacles insignia of a junior slave officer,
 	<<elseif ($activeSlave.skill.combat > 0) && getLimbCount($activeSlave, 105)>>
 		silver spear and manacles insignia of an augmented slave soldier,
@@ -829,7 +829,7 @@ $activeSlave.slaveName is
 	$His uniform is pinned with the
 	<<if ($activeSlave.ID == $Bodyguard.ID) || ($activeSlave.ID == $HeadGirl.ID) || ($activeSlave.ID == $Recruiter.ID) || ($activeSlave.ID == $Concubine.ID)>>
 		golden whip and manacles insignia of a senior slave officer,
-	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $Attendant.ID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
+	<<elseif ($activeSlave.ID == $Madam.ID) || ($activeSlave.ID == $Nurse.ID) || ($activeSlave.ID == $AttendantID) || ($activeSlave.ID == $Matron.ID) || ($activeSlave.ID == $DJ.ID) || ($activeSlave.ID == $Milkmaid.ID) || ($activeSlave.ID == $Farmer.ID) || ($activeSlave.ID == $Stewardess.ID) || ($activeSlave.ID == $Schoolteacher.ID) || ($activeSlave.ID == $Wardeness.ID)>>
 		golden manacles insignia of a junior slave officer,
 	<<elseif ($activeSlave.skill.combat > 0) && getLimbCount($activeSlave, 105)>>
 		silver spear and manacles insignia of an augmented slave soldier,