diff --git a/src/endWeek/healthFunctions.js b/src/endWeek/healthFunctions.js
index 961ac48c78e5a354eccef031b69c87c2adb8ba9b..6c844352e001f95d2def932106d02b3c1fda02d6 100644
--- a/src/endWeek/healthFunctions.js
+++ b/src/endWeek/healthFunctions.js
@@ -250,7 +250,7 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
     } else if (slave.assignment === "work a glory hole" || slave.assignment === "work as a farmhand") {
 		assignment += normalRandInt(10, 2); // Increases tired by an average of 10 points while on a very demanding assignment
 	} else if (slave.assignment === "whore" || slave.assignment === "be a servant" || slave.assignment === "serve the public" || slave.assignment === "work in the brothel" || slave.assignment === "serve in the club" || slave.assignment === "work as a servant") {
-        assignment += normalRandInt(15, 2); // Increases tired by an average of 5 points while on a demanding assignment
+        assignment += normalRandInt(5); // Increases tired by an average of 5 points while on a demanding assignment
     } else if (slave.assignment === "be your agent" || slave.assignment === "live with your agent") {
         assignment -= normalRandInt(15, 2); // Making sure agents don't get exhausted, surely they can afford to do some relaxing
     } else if (slave.assignment === "work in the dairy") {
@@ -274,11 +274,12 @@ window.tired = function tired(slave) { // Run at the end of the week to take car
         }
     } else if (slave.livingRules === "luxurious") {
         livingRules -= normalRandInt(10); // Reduces tired by an average of 10 points while sleeping under luxurious conditions
+        // PM - Luxury rooms are rooms and not subject to overcrowding penalties.
+    } else {
+		livingRules -= normalRandInt(5); // Reduces tired by an average of 5 points while sleeping under normal conditions
         if (V.dormitory < V.dormitoryPopulation) {
             livingRules += 5; // Overcrowding penalty
         }
-    } else {
-		livingRules -= normalRandInt(5); // Reduces tired by an average of 5 points while sleeping under normal conditions
 	}
 
     // Rewards