diff --git a/src/js/generateMarketSlave.js b/src/js/generateMarketSlave.js
index a7683da4f78f9a3ecec200f6ebc38b0e4d6e9d9e..c7278e9b648376c90528dcd3b70e700c6bf87289 100644
--- a/src/js/generateMarketSlave.js
+++ b/src/js/generateMarketSlave.js
@@ -2026,8 +2026,6 @@ window.generateMarketSlave = function(market = "kidnappers", numArcology = 1) {
 				V.activeSlave.skill.oral = jsRandom(20, 40);
 				V.activeSlave.anus = jsEither([0, 0, 0, 0, 1, 1, 1]);
 			}
-			V.activeSlave.oralSkill = either(60,70,80);
-			V.activeSlave.analSkill = either(60,70,80);
 			V.activeSlave.muscles = 0;
 			V.activeSlave.face = jsRandom(15,55);
 			V.activeSlave.faceShape = "androgynous";
diff --git a/src/uncategorized/resEndowment.tw b/src/uncategorized/resEndowment.tw
index 88b08d7975b80e1e54028cd47667894606b479fb..711028ba7bf26d94fa5de46bc61cf2460d69e97e 100644
--- a/src/uncategorized/resEndowment.tw
+++ b/src/uncategorized/resEndowment.tw
@@ -247,16 +247,16 @@
 <<elseif $RESEndowment == "NUL">>
 	<<link "Fund a training program for non-sexual skills">>
 		<<replace "#result">>
-			You express general satisfaction with previous graduates, but point out that their mental conditioning is incomplete at best. The representative quickly hides his incredulous glee as you outline a basic plan for an advanced training center that would use refined versions of old world mental conditioning techniques to produce total loyalty. The grateful school spreads @@.green;word of your generosity,@@ using you as an example of investment in the future of slaveowning.
+			You express general satisfaction with previous graduates, but point out that their intense androgyny is likely to be off-putting for other buyers. The representative reluctantly agrees with your doubts, and enthusiastically agrees with your idea for an intensive training regimen to teach students how to show off for their betters. The grateful school spreads @@.green;word of your generosity,@@ using you as an example of investment in the future of slaveowning.
 			<<set $NUL.schoolUpgrade = 1>>
 			<<run cashX(-50000, "capEx")>>
 			<<run repX(7500, "event")>>
 		<</replace>>
 	<</link>> //This will cost <<print cashFormat(50000)>>//
 	<br>
-	<<link "Fund a training program for non-sexual skills">>
+	<<link "Fund a training program for sexual skills">>
 		<<replace "#result">>
-			You express general satisfaction with previous graduates, but point out that in this uncertain world, it's important that every possible resource be used to defend slave society. The representative quickly hides his incredulous glee as you outline a basic plan for a combat training program that will make Gymnasium-Academy graduates lethal fighters that can be trusted not to use their talents to rebel. The grateful school spreads @@.green;word of your generosity,@@ using you as an example of investment in the future of slaveowning.
+			You express general satisfaction with previous graduates, but point out that their lack of genitalia severely hinders their use as sex slaves. The representative reluctantly agrees with your doubts, and enthusiastically agrees with your idea for an intensive training regimen to teach students how to use their mouths and asses as sexual tools. The grateful school spreads @@.green;word of your generosity,@@ using you as an example of investment in the future of slaveowning.
 			<<set $NUL.schoolUpgrade = 2>>
 			<<run cashX(-50000, "capEx")>>
 			<<run repX(7500, "event")>>
diff --git a/src/uncategorized/resFailure.tw b/src/uncategorized/resFailure.tw
index bec039e2c68728e66934e8ac5628045dbfa57bbf..c655c7ee8dc37b1dab7c08486c5abaf9ec6f3059 100644
--- a/src/uncategorized/resFailure.tw
+++ b/src/uncategorized/resFailure.tw
@@ -372,18 +372,30 @@
 		<<set $activeSlave.health = random(60,80)>>
 		<<set $activeSlave.devotion = random(60,75)>>
 		<<set $activeSlave.trust = random(60,75)>>
-		<<set $activeSlave.intelligence = Intelligence.random({limitIntelligence: [20,70]})>>
-		<<set $activeSlave.skill.oral = either(60,70,80)>>
-		<<set $activeSlave.skill.anal = either(60,70,80)>>
-		<<set $activeSlave.skill.whoring = either(20,40,40)>>
-		<<set $activeSlave.skill.entertainment = either(60,80,80,100)>>
+		<<set $activeSlave.intelligenceImplant = 30;
+		<<if $NUL.schoolUpgrade == 1>>
+			<<set $activeSlave.intelligence = random(50, 70)>>
+			<<set $activeSlave.skill.whoring = random(70, 80)>>
+			<<set $activeSlave.skill.entertainment = random(70, 80)>>
+		<<else>>
+			<<set $activeSlave.intelligence = random(20, 50)>>
+			<<set $activeSlave.skill.whoring = random(40, 50)>>
+			<<set $activeSlave.skill.entertainment = random(40, 50)>>
+		<</if>>
+		<<if $NUL.schoolUpgrade == 2>>
+			<<set $activeSlave.skill.anal = random(60, 80)>>
+			<<set $activeSlave.skill.oral = random(70, 90)>>
+			<<set $activeSlave.anus = random(1, 3);
+		<<else>>
+			<<set $activeSlave.skill.anal = random(10, 30)>>
+			<<set $activeSlave.skill.oral = random(20, 40)>>
+			<<set $activeSlave.anus = either(0, 0, 0, 0, 1, 1, 1)>>
+		<</if>>
 		<<set $activeSlave.muscles = 0>>
-		<<set $activeSlave.butt = either(4,5)>>
 		<<set $activeSlave.face = random(15,55)>>
 		<<set $activeSlave.faceShape = "androgynous">>
 		<<set $activeSlave.boobs = 50>>
 		<<set $activeSlave.butt = 0>>
-		<<set $activeSlave.anus = random(1,3)>>
 		<<set $activeSlave.vagina = -1>>
 		<<set $activeSlave.clit = 0>>
 		<<set $activeSlave.dick = 0>>