diff --git a/src/facilities/farmyard/farmyardReport.tw b/src/facilities/farmyard/farmyardReport.tw
index 9dc4adabd91da9a43583760fbc5740b5b003cbbf..a95c2f80bf0fcd47787f39a00a54c31bdc9245b5 100644
--- a/src/facilities/farmyard/farmyardReport.tw
+++ b/src/facilities/farmyard/farmyardReport.tw
@@ -203,7 +203,6 @@
 		<<set $i = $slaveIndices[$FarmyardiIDs[_dI]]>>
 		<<setLocalPronouns $slaves[$i]>>
 		/* Perform facility based rule changes */
-		<<set $slaves[$i].health += _healthBonus>>
 		<<switch $farmyardDecoration>>
 		<<case "Degradationist" "standard">>	/* TODO: add the rest of the FS */
 			<<set $slaves[$i].livingRules = "spare">>
diff --git a/src/js/rulesAutosurgery.js b/src/js/rulesAutosurgery.js
index 3f75b0ac3abfc2dc70c646b7b26d8e38435830e5..7e29f55598fa00cb9bf631452389223622a58588 100644
--- a/src/js/rulesAutosurgery.js
+++ b/src/js/rulesAutosurgery.js
@@ -129,312 +129,147 @@ window.rulesAutosurgery = (function() {
 
 	/** @param {App.Entity.SlaveState} slave */
 	function CommitSurgery(slave, thisSurgery, surgeries) {
-		if ((slave.eyes === -1) && (thisSurgery.surgery_eyes === 1)) {
-			surgeries.push("surgery to correct her vision");
-			slave.eyes = 1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.eyes === 1) && (thisSurgery.surgery_eyes === -1)) {
-			surgeries.push("surgery to blur her vision");
-			slave.eyes = -1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.hears === -1) && (thisSurgery.surgery_hears === 0)) {
-			surgeries.push("surgery to correct her hearing");
-			slave.hears = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.hears === 0) && (thisSurgery.surgery_hears === -1)) {
-			surgeries.push("surgery to muffle her hearing");
-			slave.hears = -1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.smells === -1) && (thisSurgery.surgery_smells === 0)) {
-			surgeries.push("surgery to correct her sense of smell");
-			slave.smells = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.smells === 0) && (thisSurgery.surgery_smells === -1)) {
-			surgeries.push("surgery to muffle her sense of smell");
-			slave.smells = -1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.tastes === -1) && (thisSurgery.surgery_tastes === 0)) {
-			surgeries.push("surgery to correct her sense of taste");
-			slave.tastes = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.tastes === 0) && (thisSurgery.surgery_tastes === -1)) {
-			surgeries.push("surgery to muffle her sense of taste");
-			slave.tastes = -1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.lactation === 2) && (thisSurgery.surgery_lactation === 0)) {
-			surgeries.push("surgery to remove her lactation implants");
-			slave.lactation = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if (slave.lactation !== 2 && (thisSurgery.surgery_lactation === 1)) {
-			surgeries.push("lactation inducing implanted drugs");
-			slave.lactation = 2;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.prostate === 2) && (thisSurgery.surgery_prostate === 0)) {
-			surgeries.push("surgery to remove her prostate implant");
-			slave.prostate = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if (slave.prostate === 1 && (thisSurgery.surgery_prostate === 1)) {
-			surgeries.push("a precum production enhancing drug implant");
-			slave.prostate = 2;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.faceImplant <= 15) && (slave.face <= 95) && (thisSurgery.surgery_cosmetic > 0)) {
-			surgeries.push("a nicer face");
-			if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
-			slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
-			slave.face = Math.clamp(slave.face+20,-100,100);
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.faceImplant <= 15) && (slave.ageImplant !== 1) && (slave.visualAge >= 25) && (thisSurgery.surgery_cosmetic > 0)) {
-			surgeries.push("an age lift");
-			slave.ageImplant = 1;
-			slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
-			if (slave.visualAge > 80) slave.visualAge -= 40;
-			else if (slave.visualAge >= 70) slave.visualAge -= 30;
-			else if (slave.visualAge > 50) slave.visualAge -= 20;
-			else if (slave.visualAge > 36) slave.visualAge -= 10;
-			else slave.visualAge -= 5;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if (((slave.underArmHStyle !== "bald" && slave.underArmHStyle !== "hairless") || (slave.pubicHStyle !== "bald" && slave.pubicHStyle !== "hairless")) && (thisSurgery.surgery_bodyhair === 2)) {
-			surgeries.push("body hair removal");
-			if (slave.underArmHStyle !== "hairless") slave.underArmHStyle = "bald";
-			if (slave.pubicHStyle !== "hairless") slave.pubicHStyle = "bald";
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-
-		} else if ((slave.bald === 0 || slave.hStyle !== "bald" || slave.eyebrowHStyle !== "bald") && (thisSurgery.surgery_hair === 2)) {
-			surgeries.push("hair removal");
-			slave.eyebrowHStyle = "bald";
-			slave.hStyle = "bald";
-			slave.bald = 1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-
-		} else if ((slave.weight >= 10) && (thisSurgery.surgery_cosmetic > 0)) {
-			surgeries.push("liposuction");
-			slave.weight -= 50;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.voice === 1) && (slave.voiceImplant === 0) && (thisSurgery.surgery_cosmetic > 0)) {
-			surgeries.push("a feminine voice");
-			slave.voice += 1;
-			slave.voiceImplant += 1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.waist >= -10) && (thisSurgery.surgery_cosmetic > 0)) {
-			surgeries.push("a narrower waist");
-			slave.waist -= 20;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if (((slave.boobShape === "saggy") || (slave.boobShape === "downward-facing")) && (thisSurgery.surgery_cosmetic > 0) && (slave.breastMesh !== 1)) {
-			surgeries.push("a breast lift");
-			slave.boobShape = "normal";
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if (((slave.boobShape === "normal") || (slave.boobShape === "wide-set")) && (thisSurgery.surgery_cosmetic > 0) && (slave.breastMesh !== 1)) {
-			if (slave.boobs > 800)
-				slave.boobShape = "torpedo-shaped";
-			else
-				slave.boobShape = "perky";
-			surgeries.push("more interestingly shaped breasts");
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((thisSurgery.surgery_lips === 0) && (slave.lipsImplant > 0)) {
-			surgeries.push("surgery to remove her lip implants");
-			slave.lips -= slave.lipsImplant;
-			slave.lipsImplant = 0;
-			if (slave.oralSkill > 10)
-				slave.oralSkill -= 10;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.lips <= 95) && (slave.lips < thisSurgery.surgery_lips)) {
-			if (thisSurgery.surgery_lips !== "no default setting") {
-				surgeries.push("bigger lips");
-				slave.lipsImplant += 10;
-				slave.lips += 10;
-				if (slave.oralSkill > 10)
-					slave.oralSkill -= 10;
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (slave.eyes === -1 && thisSurgery.surgery_eyes === 1) {
+				surgeries.push("surgery to correct her vision");
+				slave.eyes = 1;
 				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
-			}
-
-		} else if ((slave.faceImplant <= 45) && (slave.face <= 95) && (thisSurgery.surgery_cosmetic === 2)) {
-			surgeries.push("a nicer face");
-			if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
-			slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
-			slave.face = Math.clamp(slave.face+20,-100,100);
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.hips < 1) && (slave.hips < thisSurgery.surgery_hips) && (V.surgeryUpgrade === 1)) {
-			surgeries.push("wider hips");
-			slave.hips++;
-			slave.hipsImplant++;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.faceImplant <= 45) && (slave.ageImplant !== 1) && (slave.visualAge >= 25) && (thisSurgery.surgery_cosmetic === 2)) {
-			surgeries.push("an age lift");
-			slave.ageImplant = 1;
-			if (slave.visualAge > 80) {
-				slave.visualAge -= 40;
-			} else if (slave.visualAge >= 70) {
-				slave.visualAge -= 30;
-			} else if (slave.visualAge > 50) {
-				slave.visualAge -= 20;
-			} else if (slave.visualAge > 36) {
-				slave.visualAge -= 10;
-			} else {
-				slave.visualAge -= 5;
-			}
-			slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.waist >= -95) && (thisSurgery.surgery_cosmetic === 2) && (V.seeExtreme === 1)) {
-			surgeries.push("a narrower waist");
-			slave.waist = Math.clamp(slave.waist-20,-100,100);
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.voice < 3) && (slave.voiceImplant === 0) && (thisSurgery.surgery_cosmetic === 2)) {
-			surgeries.push("a bimbo's voice");
-			slave.voice += 1;
-			slave.voiceImplant += 1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((thisSurgery.surgery_butt === 0) && (slave.buttImplant > 0)) {
-			surgeries.push("surgery to remove her butt implants");
-			slave.butt -= slave.buttImplant;
-			slave.buttImplant = 0;
-			slave.buttImplantType = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((thisSurgery.surgery_boobs === 0) && (slave.boobsImplant > 0)) {
-			surgeries.push("surgery to remove her boob implants");
-			slave.boobs -= slave.boobsImplant;
-			slave.boobsImplant = 0;
-			slave.boobsImplantType = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-		} else if ((slave.butt <= 3) && (slave.butt < thisSurgery.surgery_butt)) {
-			if (thisSurgery.surgery_butt !== "no default setting") {
-				surgeries.push("a bigger butt");
-				slave.buttImplant = 1;
-				slave.butt += 1;
+			} else if (slave.eyes === 1 && thisSurgery.surgery_eyes === -1) {
+				surgeries.push("surgery to blur her vision");
+				slave.eyes = -1;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.hears === -1 && thisSurgery.surgery_hears === 0) {
+				surgeries.push("surgery to correct her hearing");
+				slave.hears = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.hears === 0 && thisSurgery.surgery_hears === -1) {
+				surgeries.push("surgery to muffle her hearing");
+				slave.hears = -1;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.smells === -1 && thisSurgery.surgery_smells === 0) {
+				surgeries.push("surgery to correct her sense of smell");
+				slave.smells = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.smells === 0 && thisSurgery.surgery_smells === -1) {
+				surgeries.push("surgery to muffle her sense of smell");
+				slave.smells = -1;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.tastes === -1 && thisSurgery.surgery_tastes === 0) {
+				surgeries.push("surgery to correct her sense of taste");
+				slave.tastes = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.tastes === 0 && thisSurgery.surgery_tastes === -1) {
+				surgeries.push("surgery to muffle her sense of taste");
+				slave.tastes = -1;
 				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
 			}
-		} else if ((slave.boobs <= 600) && (slave.lactation < 2) && (slave.boobs+400 <= thisSurgery.surgery_boobs)) {
-			if (thisSurgery.surgery_boobs !== "no default setting") {
+		}
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (slave.lactation === 2 && thisSurgery.surgery_lactation === 0) {
+				surgeries.push("surgery to remove her lactation implants");
+				slave.lactation = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.lactation !== 2 && (thisSurgery.surgery_lactation === 1)) {
+				surgeries.push("lactation inducing implanted drugs");
+				slave.lactation = 2;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if ((slave.boobShape === "saggy" || slave.boobShape === "downward-facing") && thisSurgery.surgery_cosmetic > 0 && slave.breastMesh !== 1) {
+				surgeries.push("a breast lift");
+				slave.boobShape = "normal";
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if ((slave.boobShape === "normal" || slave.boobShape === "wide-set") && thisSurgery.surgery_cosmetic > 0 && slave.breastMesh !== 1) {
+				if (slave.boobs > 800)
+					slave.boobShape = "torpedo-shaped";
+				else
+					slave.boobShape = "perky";
+				surgeries.push("more interestingly shaped breasts");
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (thisSurgery.surgery_boobs === 0 && slave.boobsImplant > 0) {
+				surgeries.push("surgery to remove her boob implants");
+				slave.boobs -= slave.boobsImplant;
+				slave.boobsImplant = 0;
+				slave.boobsImplantType = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.boobs <= 600 && slave.lactation < 2 && (slave.boobs + 400 <= thisSurgery.surgery_boobs)) {
 				surgeries.push("bigger boobs");
 				slave.boobsImplant += 400;
 				slave.boobs += 400;
 				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
-			}
-		} else if ((slave.boobs <= 600) && (slave.lactation < 2) && (slave.boobs+200 <= thisSurgery.surgery_boobs)) {
-			if (thisSurgery.surgery_boobs !== "no default setting") {
+			} else if (slave.boobs <= 600 && slave.lactation < 2 && (slave.boobs + 200 <= thisSurgery.surgery_boobs)) {
 				surgeries.push("modestly bigger boobs");
 				slave.boobsImplant += 200;
 				slave.boobs += 200;
 				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
+			} else if (slave.boobs <= 2000 && slave.lactation < 2 && (slave.boobs + 400 < thisSurgery.surgery_boobs)) {
+				surgeries.push("bigger boobs");
+				slave.boobsImplant += 400;
+				slave.boobs += 400;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.boobs <= 9000 && slave.lactation < 2 && (slave.boobs < thisSurgery.surgery_boobs)) {
+				surgeries.push("bigger boobs");
+				slave.boobsImplant += 200;
+				slave.boobs += 200;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
 			}
-
-		} else if ((slave.butt <= 5) && (slave.butt < thisSurgery.surgery_butt)) {
-			if (thisSurgery.surgery_butt !== "no default setting") {
+		}
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (thisSurgery.surgery_butt === 0 && slave.buttImplant > 0) {
+				surgeries.push("surgery to remove her butt implants");
+				slave.butt -= slave.buttImplant;
+				slave.buttImplant = 0;
+				slave.buttImplantType = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.butt <= 3 && (slave.butt < thisSurgery.surgery_butt)) {
 				surgeries.push("a bigger butt");
 				slave.buttImplant = 1;
 				slave.butt += 1;
 				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
-			}
-
-		} else if ((slave.boobs <= 2000) && (slave.lactation < 2) && (slave.boobs+400 < thisSurgery.surgery_boobs)) {
-			if (thisSurgery.surgery_boobs !== "no default setting") {
-				surgeries.push("bigger boobs");
-				slave.boobsImplant += 400;
-				slave.boobs += 400;
+			} else if (slave.butt <= 5 && (slave.butt < thisSurgery.surgery_butt)) {
+				surgeries.push("a bigger butt");
+				slave.buttImplant = 1;
+				slave.butt += 1;
 				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
-			}
-
-		} else if ((slave.hips < 2) && (slave.hips < thisSurgery.surgery_hips) && (V.surgeryUpgrade === 1)) {
-			surgeries.push("wider hips");
-			slave.hips++;
-			slave.hipsImplant++;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.butt <= 8) && (slave.butt < thisSurgery.surgery_butt)) {
-			if (thisSurgery.surgery_butt !== "no default setting") {
+			} else if (slave.butt <= 8 && (slave.butt < thisSurgery.surgery_butt)) {
 				surgeries.push("a bigger butt");
 				slave.buttImplant = 1;
 				slave.butt += 1;
@@ -442,128 +277,263 @@ window.rulesAutosurgery = (function() {
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
 			}
-
-		} else if ((slave.boobs <= 9000) && (slave.lactation < 2) && (slave.boobs < thisSurgery.surgery_boobs)) {
-			if (thisSurgery.surgery_boobs !== "no default setting") {
-				surgeries.push("bigger boobs");
-				slave.boobsImplant += 200;
-				slave.boobs += 200;
+		}
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (slave.anus > 3 && thisSurgery.surgery_cosmetic > 0) {
+				surgeries.push("a restored anus");
+				slave.anus = 3;
+				if (slave.analSkill > 10)
+					slave.analSkill -= 10;
 				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 				if (V.PC.medicine >= 100) slave.health -= 5;
 				else slave.health -= 10;
-			}
-
-		} else if ((slave.hips < 3) && (slave.hips < thisSurgery.surgery_hips) && (V.surgeryUpgrade === 1)) {
-			surgeries.push("wider hips");
-			slave.hips++;
-			slave.hipsImplant++;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
 
-		} else if (slave.bellyImplant < 0 && V.bellyImplants > 0 && thisSurgery.surgery_bellyImplant === "install" && slave.womb.length === 0 && slave.broodmother === 0) {
-			slave.bellyImplant = 100;
-			slave.preg = -2;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (slave.ovaries === 1 || slave.mpreg === 1) {
-				surgeries.push("belly implant");
-				V.surgeryType = "bellyIn";
-				if (V.PC.medicine >= 100) slave.health -= 5;
-				else slave.health -= 10;
-			} else {
-				surgeries.push("male belly implant");
-				V.surgeryType = "bellyInMale";
-				if (V.PC.medicine >= 100) slave.health -= 25;
-				else slave.health -= 50;
-			}
-			bellyIn(slave);
+			} else if (slave.vagina > 3 && thisSurgery.surgery_cosmetic > 0) {
+				surgeries.push("a restored pussy");
+				slave.vagina = 3;
+				if (slave.vaginalSkill > 10)
+					slave.vaginalSkill -= 10;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
 
-		} else if (slave.bellyImplant >= 0 && thisSurgery.surgery_bellyImplant === "remove") {
-			surgeries.push("belly implant removal");
-			V.surgeryType = "bellyOut";
-			if (V.PC.medicine >= 100)
-				slave.health -= 5;
-			else
-				slave.health -= 10;
-			slave.preg = 0;
-			slave.bellyImplant = -1;
-			slave.cervixImplant = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-		} else if (slave.balls > 0 && slave.vasectomy === 0 && thisSurgery.surgery_vasectomy === true) {
-			surgeries.push("vasectomy");
-			V.surgeryType = "vasectomy";
-			if (V.PC.medicine >= 100)
-				slave.health -= 5;
-			else
-				slave.health -= 10;
-			slave.vasectomy = 1;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-		} else if (slave.balls > 0 && slave.vasectomy === 1 && thisSurgery.surgery_vasectomy === false) {
-			surgeries.push("undo vasectomy");
-			V.surgeryType = "vasectomy undo";
-			if (V.PC.medicine >= 100)
-				slave.health -=5;
-			else
-				slave.health -= 10;
-			slave.vasectomy = 0;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+			} else if (slave.anus > 0 && V.surgeryUpgrade === 1 && thisSurgery.surgery_holes === 2) {
+				surgeries.push("a virgin anus");
+				slave.anus = 0;
+				if (slave.analSkill > 10) {
+					slave.analSkill -= 10;
+				}
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
 
-		} else if ((slave.anus > 3) && (thisSurgery.surgery_cosmetic > 0)) {
-			surgeries.push("a restored anus");
-			slave.anus = 3;
-			if (slave.analSkill > 10)
-				slave.analSkill -= 10;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
+			} else if (slave.vagina > 0 && V.surgeryUpgrade === 1 && thisSurgery.surgery_holes === 2) {
+				surgeries.push("a virgin pussy");
+				slave.vagina = 0;
+				if (slave.vaginalSkill > 10)
+					slave.vaginalSkill -= 10;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
 
-		} else if ((slave.vagina > 3) && (thisSurgery.surgery_cosmetic > 0)) {
-			surgeries.push("a restored pussy");
-			slave.vagina = 3;
-			if (slave.vaginalSkill > 10)
-				slave.vaginalSkill -= 10;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
+			} else if (slave.anus > 1 && thisSurgery.surgery_holes === 1) {
+				surgeries.push("a tighter anus");
+				slave.anus = 1;
+				if (slave.analSkill > 10) {
+					slave.analSkill -= 10;
+				}
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
 
-		} else if ((slave.anus > 0) && (V.surgeryUpgrade === 1) && (thisSurgery.surgery_holes === 2)) {
-			surgeries.push("a virgin anus");
-			slave.anus = 0;
-			if (slave.analSkill > 10) {
-				slave.analSkill -= 10;
+			} else if (slave.vagina > 1 && thisSurgery.surgery_holes === 1) {
+				surgeries.push("a tighter pussy");
+				slave.vagina = 1;
+				if (slave.vaginalSkill > 10) {
+					slave.vaginalSkill -= 10;
+				}
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
 			}
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.vagina > 0) && (V.surgeryUpgrade === 1) && (thisSurgery.surgery_holes === 2)) {
-			surgeries.push("a virgin pussy");
-			slave.vagina = 0;
-			if (slave.vaginalSkill > 10)
-				slave.vaginalSkill -= 10;
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.anus > 1) && (thisSurgery.surgery_holes === 1)) {
-			surgeries.push("a tighter anus");
-			slave.anus = 1;
-			if (slave.analSkill > 10) {
-				slave.analSkill -= 10;
+		}
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (slave.prostate === 2 && thisSurgery.surgery_prostate === 0) {
+				surgeries.push("surgery to remove her prostate implant");
+				slave.prostate = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.prostate === 1 && thisSurgery.surgery_prostate === 1) {
+				surgeries.push("a precum production enhancing drug implant");
+				slave.prostate = 2;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.balls > 0 && slave.vasectomy === 0 && thisSurgery.surgery_vasectomy === true) {
+				surgeries.push("vasectomy");
+				V.surgeryType = "vasectomy";
+				if (V.PC.medicine >= 100)
+					slave.health -= 5;
+				else
+					slave.health -= 10;
+				slave.vasectomy = 1;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+			} else if (slave.balls > 0 && slave.vasectomy === 1 && thisSurgery.surgery_vasectomy === false) {
+				surgeries.push("undo vasectomy");
+				V.surgeryType = "vasectomy undo";
+				if (V.PC.medicine >= 100)
+					slave.health -=5;
+				else
+					slave.health -= 10;
+				slave.vasectomy = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 			}
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
-
-		} else if ((slave.vagina > 1) && (thisSurgery.surgery_holes === 1)) {
-			surgeries.push("a tighter pussy");
-			slave.vagina = 1;
-			if (slave.vaginalSkill > 10) {
-				slave.vaginalSkill -= 10;
+		}
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (slave.faceImplant <= 15 && slave.face <= 95 && thisSurgery.surgery_cosmetic > 0) {
+				surgeries.push("a nicer face");
+				if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
+				slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
+				slave.face = Math.clamp(slave.face+20,-100,100);
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.faceImplant <= 15 && slave.ageImplant !== 1 && slave.visualAge >= 25 && thisSurgery.surgery_cosmetic > 0) {
+				surgeries.push("an age lift");
+				slave.ageImplant = 1;
+				slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
+				if (slave.visualAge > 80) slave.visualAge -= 40;
+				else if (slave.visualAge >= 70) slave.visualAge -= 30;
+				else if (slave.visualAge > 50) slave.visualAge -= 20;
+				else if (slave.visualAge > 36) slave.visualAge -= 10;
+				else slave.visualAge -= 5;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (((slave.underArmHStyle !== "bald" && slave.underArmHStyle !== "hairless") || (slave.pubicHStyle !== "bald" && slave.pubicHStyle !== "hairless")) && thisSurgery.surgery_bodyhair === 2) {
+				surgeries.push("body hair removal");
+				if (slave.underArmHStyle !== "hairless") slave.underArmHStyle = "bald";
+				if (slave.pubicHStyle !== "hairless") slave.pubicHStyle = "bald";
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+			} else if ((slave.bald === 0 || slave.hStyle !== "bald" || slave.eyebrowHStyle !== "bald") && thisSurgery.surgery_hair === 2) {
+				surgeries.push("hair removal");
+				slave.eyebrowHStyle = "bald";
+				slave.hStyle = "bald";
+				slave.bald = 1;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+			} else if (slave.weight >= 10 && thisSurgery.surgery_cosmetic > 0) {
+				surgeries.push("liposuction");
+				slave.weight -= 50;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.voice === 1 && slave.voiceImplant === 0 && thisSurgery.surgery_cosmetic > 0) {
+				surgeries.push("a feminine voice");
+				slave.voice += 1;
+				slave.voiceImplant += 1;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (thisSurgery.surgery_lips === 0 && slave.lipsImplant > 0) {
+				surgeries.push("surgery to remove her lip implants");
+				slave.lips -= slave.lipsImplant;
+				slave.lipsImplant = 0;
+				if (slave.oralSkill > 10)
+					slave.oralSkill -= 10;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.lips <= 95 && (slave.lips < thisSurgery.surgery_lips)) {
+				surgeries.push("bigger lips");
+				slave.lipsImplant += 10;
+				slave.lips += 10;
+				if (slave.oralSkill > 10)
+					slave.oralSkill -= 10;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.faceImplant <= 45 && slave.face <= 95 && thisSurgery.surgery_cosmetic === 2) {
+				surgeries.push("a nicer face");
+				if (slave.faceShape === "masculine") slave.faceShape = "androgynous";
+				slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
+				slave.face = Math.clamp(slave.face+20,-100,100);
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.faceImplant <= 45 && slave.ageImplant !== 1 && slave.visualAge >= 25 && thisSurgery.surgery_cosmetic === 2) {
+				surgeries.push("an age lift");
+				slave.ageImplant = 1;
+				if (slave.visualAge > 80) {
+					slave.visualAge -= 40;
+				} else if (slave.visualAge >= 70) {
+					slave.visualAge -= 30;
+				} else if (slave.visualAge > 50) {
+					slave.visualAge -= 20;
+				} else if (slave.visualAge > 36) {
+					slave.visualAge -= 10;
+				} else {
+					slave.visualAge -= 5;
+				}
+				slave.faceImplant += 25-5*Math.trunc(V.PC.medicine/50)-5*V.surgeryUpgrade;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.voice < 3 && slave.voiceImplant === 0 && thisSurgery.surgery_cosmetic === 2) {
+				surgeries.push("a bimbo's voice");
+				slave.voice += 1;
+				slave.voiceImplant += 1;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			}
+		}
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (slave.waist >= -10 && thisSurgery.surgery_cosmetic > 0) {
+				surgeries.push("a narrower waist");
+				slave.waist -= 20;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.hips < 1 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.surgery_hips)) {
+				surgeries.push("wider hips");
+				slave.hips++;
+				slave.hipsImplant++;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.waist >= -95 && V.seeExtreme === 1 && thisSurgery.surgery_cosmetic === 2) {
+				surgeries.push("a narrower waist");
+				slave.waist = Math.clamp(slave.waist-20,-100,100);
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.hips < 2 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.surgery_hips)) {
+				surgeries.push("wider hips");
+				slave.hips++;
+				slave.hipsImplant++;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			} else if (slave.hips < 3 && V.surgeryUpgrade === 1 && (slave.hips < thisSurgery.surgery_hips)) {
+				surgeries.push("wider hips");
+				slave.hips++;
+				slave.hipsImplant++;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (V.PC.medicine >= 100) slave.health -= 5;
+				else slave.health -= 10;
+			}
+		}
+		if (slave.health > 20 && surgeries.length < 3) {
+			if (slave.bellyImplant < 0 && V.bellyImplants > 0 && thisSurgery.surgery_bellyImplant === "install" && slave.womb.length === 0 && slave.broodmother === 0) {
+				slave.bellyImplant = 100;
+				slave.preg = -2;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
+				if (slave.ovaries === 1 || slave.mpreg === 1) {
+					surgeries.push("belly implant");
+					V.surgeryType = "bellyIn";
+					if (V.PC.medicine >= 100) slave.health -= 5;
+					else slave.health -= 10;
+				} else {
+					surgeries.push("male belly implant");
+					V.surgeryType = "bellyInMale";
+					if (V.PC.medicine >= 100) slave.health -= 25;
+					else slave.health -= 50;
+				}
+				bellyIn(slave);
+
+			} else if (slave.bellyImplant >= 0 && thisSurgery.surgery_bellyImplant === "remove") {
+				surgeries.push("belly implant removal");
+				V.surgeryType = "bellyOut";
+				if (V.PC.medicine >= 100)
+					slave.health -= 5;
+				else
+					slave.health -= 10;
+				slave.preg = 0;
+				slave.bellyImplant = -1;
+				slave.cervixImplant = 0;
+				cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
 			}
-			cashX(forceNeg(V.surgeryCost), "slaveSurgery", slave);
-			if (V.PC.medicine >= 100) slave.health -= 5;
-			else slave.health -= 10;
 		}
 	}
 
diff --git a/src/js/walkPastJS.js b/src/js/walkPastJS.js
index 276e57bfb25c4a28f875410ba41de7b55cef8ddd..ecadb36ec04b2863bafe19728c8445137791c0a2 100644
--- a/src/js/walkPastJS.js
+++ b/src/js/walkPastJS.js
@@ -2926,3 +2926,96 @@ window.anusWatch = function(slave) {
 
 	return t;
 };
+
+
+window.lipWatch = function(slave) {
+
+	/* will be moved up once this becomes a single, contained function. */
+	let t = "";
+	let V = State.variables;
+
+	let pronouns = getPronouns(slave);
+	let he = pronouns.pronoun, him = pronouns.object, his = pronouns.possessive, hers = pronouns.possessivePronoun, himself = pronouns.objectReflexive, boy = pronouns.noun;
+	let He = capFirstChar(he), His = capFirstChar(his);
+
+	t += `<<faceDescription>>`;
+	t += `<<mouthDescription>>`;
+	switch (slave.collar) {
+		case "a Fuckdoll suit":
+			t += `${His} suit is expressly designed to encourage use of ${his} face hole.`;
+			break;
+		case "uncomfortable leather":
+			t += `${His} uncomfortable leather collar makes ${him} swallow and lick ${his} lips periodically, making it look like ${he}'s offering oral even though ${he}'s just trying to relieve the discomfort.`;
+			break;
+		case "tight steel":
+		case "cruel retirement counter":
+			t += `${His} tight steel collar makes ${him} swallow and lick ${his} lips periodically, making it look like ${he}'s offering oral even though ${he}'s just trying to relieve the discomfort.`;
+			break;
+		case "preg biometrics":
+			t += `${His} collar reveals everything about ${his} womb, bringing eyes straight to ${his} belly before drawing them back to ${his} neck.`;
+			break;
+		case "dildo gag":
+			t += `${His} ring gag would make ${him} ready for oral service, as soon as the formidable dildo it secures down ${his} throat is removed.`;
+			break;
+		case "massive dildo gag":
+			t += `Your eyes are drawn to the distinct bulge in ${his} throat caused by the enormous dildo in it, though ${his} mouth would only be suitable for the largest of cocks right now.`;
+			break;
+		case "shock punishment":
+			t += `${His} shock collar rests threateningly at ${his} throat, ready to compel ${him} to do anything you wish.`;
+			break;
+		case "neck corset":
+			t += `${His} fitted neck corset keeps ${his} breaths shallow, and ${his} head posture rigidly upright.`;
+			break;
+		case "stylish leather":
+			t += `${His} stylish leather collar is at once a fashion statement, and a subtle indication of ${his} enslavement.`;
+			break;
+		case "satin choker":
+			t += `${His} elegant satin choker is at once a fashion statement, and a subtle indication of ${his} enslavement.`;
+			break;
+		case "silk ribbon":
+			t += `${His} delicate, fitted silken ribbon is at once a fashion statement, and a subtle indication of ${his} enslavement.`;
+			break;
+		case "heavy gold":
+			t += `${His} heavy gold collar draws attention to the sexual decadence of ${his} mouth.`;
+			break;
+		case "pretty jewelry":
+		case "nice retirement counter":
+			t += `${His} pretty necklace can hardly be called a collar, but it's just slavish enough to hint that the throat it rests on is available.`;
+			break;
+		case "bell collar":
+			t += `${His} little bell tinkles merrily whenever ${he} moves, dispelling any grace or gravity.`;
+			break;
+		case "leather with cowbell":
+			t += `${His} cowbell tinkles merrily whenever ${he} moves, instantly dispelling any grace or gravity.`;
+			break;
+		case "bowtie":
+			t += `${His} black bowtie contrasts with ${his} white collar, drawing the eye towards ${his} neck and face.`;
+			break;
+		case "ancient Egyptian":
+			t += `${His} wesekh glints richly as ${he} moves, sparkling with opulence and sensuality.`;
+			break;
+		case "ball gag":
+			t += `${His} ball gag uncomfortably holds ${his} jaw apart as it fills ${his} mouth.`;
+			break;
+		case "bit gag":
+			t += `${His} bit gag uncomfortably keeps ${him} from closing ${his} jaw; drool visibly pools along the corners of ${his} mouth, where the rod forces back ${his} cheeks.`;
+			break;
+		case "porcelain mask":
+			t += `${His} beautiful porcelain mask hides ${his} face and any unsightly facial features.`;
+			break;
+		default:
+			t += `${His} unadorned `;
+			if (V.PC.dick == 1) {
+				t += `throat is just waiting to be wrapped around a thick shaft.`;
+			} else {
+				t += `lips are just begging for a cunt to lavish attention on.`;
+			}
+	}
+	if (jsRandom(1,3) === 1) {
+		V.target = "FKiss";
+	} else {
+		V.target = "FLips";
+	}
+
+	return t;
+};
\ No newline at end of file
diff --git a/src/uncategorized/main.tw b/src/uncategorized/main.tw
index da15e298a074507d564995966d35f8179c470ec5..7530e37a8e7b3f6606f96db0400ded4d22988442 100644
--- a/src/uncategorized/main.tw
+++ b/src/uncategorized/main.tw
@@ -555,5 +555,5 @@ Filter by assignment: |
 
 <<set $activeSlave = $slaves.random()>>
 <<if $activeSlave && ($activeSlave.assignment != "please you") && ($activeSlave.assignment != "guard you")>>
-	<br><<include "Walk Past">>
+	<br>//<span id="walk"><<include "Walk Past">></span>//
 <</if>>
diff --git a/src/uncategorized/walkPast.tw b/src/uncategorized/walkPast.tw
index 7e9387dfe2ea74233c52173cbd24e95373a75595..d2347777a179bec335987a09371e077bed0a4f13 100644
--- a/src/uncategorized/walkPast.tw
+++ b/src/uncategorized/walkPast.tw
@@ -1,6 +1,5 @@
 :: Walk Past [nobr]
 
-//
 <<set $target = "">>
 <<set _seed = random(1,100)>>
 <<if $familyTesting == 1 && totalRelatives($activeSlave) > 0 && random(1,100) > 80>>
@@ -34,8 +33,6 @@
 
 <<setLocalPronouns $activeSlave>>
 
-<span id="walk">
-
 <<= primeSlave($activeSlave, _seed)>>
 
 <<if ($partner == "rivalry")>>
@@ -3119,57 +3116,9 @@
 	<<= anusWatch($activeSlave)>>
 
 <<elseif (_flag > 0)>>
-	<<faceDescription>>
-	<<mouthDescription>>
-	<<switch $activeSlave.collar>>
-	<<case "a Fuckdoll suit">>
-		$His suit is expressly designed to encourage use of $his face hole.
-	<<case "uncomfortable leather">>
-		$His uncomfortable leather collar makes $him swallow and lick $his lips periodically, making it look like $he's offering oral even though $he's just trying to relieve the discomfort.
-	<<case "tight steel" "cruel retirement counter">>
-		$His tight steel collar makes $him swallow and lick $his lips periodically, making it look like $he's offering oral even though $he's just trying to relieve the discomfort.
-	<<case "preg biometrics">>
-		$His collar reveals everything about $his womb, bringing eyes straight to $his belly before drawing them back to $his neck.
-	<<case "dildo gag">>
-		$His ring gag would make $him ready for oral service, as soon as the formidable dildo it secures down $his throat is removed.
-	<<case "massive dildo gag">>
-		Your eyes are drawn to the distinct bulge in $his throat caused by the enormous dildo in it, though $his mouth would only be suitable for the largest of cocks right now.
-	<<case "shock punishment">>
-		$His shock collar rests threateningly at $his throat, ready to compel $him to do anything you wish.
-	<<case "neck corset">>
-		$His fitted neck corset keeps $his breaths shallow, and $his head posture rigidly upright.
-	<<case "stylish leather">>
-		$His stylish leather collar is at once a fashion statement, and a subtle indication of $his enslavement.
-	<<case "satin choker">>
-		$His elegant satin choker is at once a fashion statement, and a subtle indication of $his enslavement.
-	<<case "silk ribbon">>
-		$His delicate, fitted silken ribbon is at once a fashion statement, and a subtle indication of $his enslavement.
-	<<case "heavy gold">>
-		$His heavy gold collar draws attention to the sexual decadence of $his mouth.
-	<<case "pretty jewelry" "nice retirement counter">>
-		$His pretty necklace can hardly be called a collar, but it's just slavish enough to hint that the throat it rests on is available.
-	<<case "bell collar">>
-		$His little bell tinkles merrily whenever $he moves, dispelling any grace or gravity.
-	<<case "leather with cowbell">>
-		$His cowbell tinkles merrily whenever $he moves, instantly dispelling any grace or gravity.
-	<<case "bowtie">>
-		$His black bowtie contrasts with $his white collar, drawing the eye towards $his neck and face.
-	<<case "ancient Egyptian">>
-		$His wesekh glints richly as $he moves, sparkling with opulence and sensuality.
-	<<case "ball gag">>
-		$His ball gag uncomfortably holds $his jaw apart as it fills $his mouth.
-	<<case "bit gag">>
-		$His bit gag uncomfortably keeps $him from closing $his jaw; drool visibly pools along the corners of $his mouth, where the rod forces back $his cheeks.
-	<<case "porcelain mask">>
-		$His beautiful porcelain mask hides $his unsightly facial features.
-	<<default>>
-		$His unadorned <<if $PC.dick == 1>>throat is just waiting to be wrapped around a thick shaft<<else>>lips are just begging for a cunt to lavish attention on<</if>>.
-	<</switch>>
-	<<if random(1,3) == 1>>
-		<<set $target = "FKiss">>
-	<<else>>
-		<<set $target = "FLips">>
-	<</if>>
+
+	<<= lipWatch($activeSlave)>>
+
 <</if>>
 
 <<if $activeSlave.fuckdoll == 0>>
@@ -3201,6 +3150,4 @@
 	<<default>>
 		<span id="walkpast"><<link "Fuck $him">><<replace "#walk">><<FFuckdollOral>><</replace>><</link>></span>
 	<</switch>>
-<</if>>
-</span>
-//
+<</if>>
\ No newline at end of file