diff --git a/src/endWeek/minorInjuryResponse.js b/src/endWeek/minorInjuryResponse.js
index c6468a49879a5698370a9adf04185141616a1d2e..170a649946cb35cc570d8db7b22a5f418d40a086 100644
--- a/src/endWeek/minorInjuryResponse.js
+++ b/src/endWeek/minorInjuryResponse.js
@@ -6,66 +6,240 @@ window.minorInjuryResponse = function minorInjuryResponse(slave) {
 	const arcology = State.variables.arcologies[0];
 	const arcologyUpgrade = State.variables.arcologyUpgrade;
 	const {he, himself, He} = getPronouns(slave);
-	let trackedUpkeep = "";
+	let r = "";
 
 	switch (slave.assignment) {
 		case window.Job.WHORE:
-			trackedUpkeep = "slaveUpkeepWhore";
+			if (arcology.FSDegradationist > 20) {
+				r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
+			} else if (arcology.FSPaternalist > 20) {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepWhore", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepWhore", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepWhore", slave);
+				}
+			} else {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				}
+			}		
 			break;
 		case window.Job.MADAM:
-			trackedUpkeep = "slaveUpkeepMadam";
+			if (arcology.FSDegradationist > 20) {
+				r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
+			} else if (arcology.FSPaternalist > 20) {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepMadam", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepMadam", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepMadam", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepMadam", slave);
+				}
+			} else {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepMadam", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepMadam", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepMadam", slave);
+				}
+			}		
 			break;
 		case window.Job.BROTHEL:
-			trackedUpkeep = "slaveUpkeepBrothel"
+			if (arcology.FSDegradationist > 20) {
+				r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
+			} else if (arcology.FSPaternalist > 20) {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepBrothel", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepBrothel", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepBrothel", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepBrothel", slave);
+				}
+			} else {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepBrothel", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepBrothel", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepBrothel", slave);
+				}
+			}		
 			break;
 		case window.Job.PUBLIC:
-			trackedUpkeep = "slaveUpkeepPublic"
+			if (arcology.FSDegradationist > 20) {
+				r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
+			} else if (arcology.FSPaternalist > 20) {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepPublic", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepPublic", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepPublic", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepPublic", slave);
+				}
+			} else {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepPublic", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepPublic", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepPublic", slave);
+				}
+			}		
 			break;
 		case window.Job.DJ:
-			trackedUpkeep = "slaveUpkeepDj";
+			if (arcology.FSDegradationist > 20) {
+				r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
+			} else if (arcology.FSPaternalist > 20) {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepDj", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepDj", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepDj", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepDj", slave);
+				}
+			} else {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepDj", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepDj", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepDj", slave);
+				}
+			}		
 			break;
 		case window.Job.CLUB:
-			trackedUpkeep = "slaveUpkeepClub";
+			if (arcology.FSDegradationist > 20) {
+				r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
+			} else if (arcology.FSPaternalist > 20) {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepClub", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepClub", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepClub", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepClub", slave);
+				}
+			} else {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepClub", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepClub", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepClub", slave);
+				}
+			}		
 			break;
 		default:
-			trackedUpkeep = "slaveUpkeepUndefined";
+			if (arcology.FSDegradationist > 20) {
+				r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
+			} else if (arcology.FSPaternalist > 20) {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepUndefined", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepUndefined", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepUndefined", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
+					cashX(50, "slaveUpkeepUndefined", slave);
+				}
+			} else {
+				if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
+					r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepWhore", slave);
+				} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
+					r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepUndefined", slave);
+				} else if (slave.skill.whoring > jsRandom(1, 100)) {
+					r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepUndefined", slave);
+				} else if (slave.skill.combat > 0) {
+					r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
+					cashX(10, "slaveUpkeepUndefined", slave);
+				}
+			}		
 			break;
 	}
-	return responseWithTracking(slave, trackedUpkeep);
-	
-	function responseWithTracking(slave, trackedUpkeep) {
-		let r = "";
-
-		if (arcology.FSDegradationist > 20) {
-			r += ` ${He} carries on, knowing that in your degradationist arcology, this is accepted behavior.`;
-		} else if (arcology.FSPaternalist > 20) {
-			if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
-				r += ` The security drones successfully detain him and oblige him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
-				cashX(50, trackedUkeep, slave);
-			} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
-				r += ` The computer systems successfully detain him and require him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
-				cashX(50, trackedUpkeep, slave);
-			} else if (slave.skill.whoring > jsRandom(1, 100)) {
-				r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
-				cashX(50, trackedUpkeep, slave);
-			} else if (slave.skill.combat > 0) {
-				r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay significant <span class="yellowgreen">compensation,</span> since abusing slaves is discouraged here.`;
-				cashX(50, trackedUpkeep, slave);
-			}
-		} else {
-			if (arcologyUpgrade.drones === 1 && jsRandom(1, 100) > 50) {
-				r += ` The security drones successfully detain him and oblige him to pay minor <span class="yellowgreen">compensation.</span>`;
-				cashX(10, trackedUpkeep, slave);
-			} else if (arcologyUpgrade.grid === 1 && jsRandom(1, 100) > 50) {
-				r += ` The computer systems successfully detain him and require him to pay minor <span class="yellowgreen">compensation.</span>`;
-				cashX(10, trackedUpkeep, slave);
-			} else if (slave.skill.whoring > jsRandom(1, 100)) {
-				r += ` ${slave.slaveName} is used to this sort of thing, and convinces him to pay minor <span class="yellowgreen">compensation.</span>`;
-				cashX(10, trackedUpkeep, slave);
-			} else if (slave.skill.combat > 0) {
-				r += ` ${slave.slaveName} can take care of ${himself}, and ${he} successfully forces him to pay minor <span class="yellowgreen">compensation.</span>`;
-				cashX(10, trackedUpkeep, slave);
-			}
-		}
-	}
+	return r;
 };