diff --git a/src/uncategorized/slaveAssignmentsReport.tw b/src/uncategorized/slaveAssignmentsReport.tw
index 92acf3a9de058911462adfab211a29e056b6f3fb..387f38d5c405b4bf50c907da9b7d936c56647918 100644
--- a/src/uncategorized/slaveAssignmentsReport.tw
+++ b/src/uncategorized/slaveAssignmentsReport.tw
@@ -35,17 +35,6 @@ $NPCMarketShare = {lowerClass: 0, middleClass: 0, upperClass: 0, topClass: 0},
 $sexDemandResult = {lowerClass: 0, middleClass: 0, upperClass: 0, topClass: 0},
 $slaveJobValues = slaveJobValues(_lowerClassSexDemandRef, _middleClassSexDemandRef, _upperClassSexDemandRef, _topClassSexDemandRef)>>
 
-/*Supply of sexual services*/
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>Lower Class SD: <<print _lowerClassSexDemandRef>>
-	<br>Middle Class SD: <<print _middleClassSexDemandRef>>
-	<br>Upper Class SD: <<print _upperClassSexDemandRef>>
-	<br>Top Class SD: <<print _topClassSexDemandRef>>
-	<br>Club SP: <<print Math.trunc($slaveJobValues.club * $slaveJobValues.clubSP)>>
-	<br>Arcade SP: <<print $slaveJobValues.arcade>>
-	<br>Brothel SP: <<print $slaveJobValues.brothel.lowerClass>>, <<print $slaveJobValues.brothel.middleClass>>, <<print $slaveJobValues.brothel.upperClass>>, <<print $slaveJobValues.brothel.topClass>>
-<</if>>
-
 /*Arcade Specific Demand for Degradationists to give it higher priority*/
 <<if $arcologies[0].FSDegradationist != "unset">>
 	<<set _lowerClassArcadeSexDemand = Math.trunc(_lowerClassSexDemand * $arcologies[0].FSDegradationist * 0.0015),
@@ -175,47 +164,152 @@ $NPCMarketShare.topClass = Math.trunc(($NPCSexSupply.topClass * 1000) / _topClas
 <<else>>
 	<<set _lowerClassSexDemand -= $NPCSexSupply.lowerClass>>
 <</if>>
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>NPC Supply Lower Class: $NPCSexSupply.lowerClass
-<</if>>
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>Leftover Lower Class SD: <<print _lowerClassSexDemand>>
-<</if>>
 
 <<if _middleClassSexDemand < $NPCSexSupply.middleClass>>
 	<<set _middleClassSexDemand = 0>>
 <<else>>
 	<<set _middleClassSexDemand -= $NPCSexSupply.middleClass>>
 <</if>>
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>NPC Supply Middle Class: $NPCSexSupply.middleClass
-<</if>>
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>Leftover Middle Class SD: <<print _middleClassSexDemand>>
-<</if>>
 
 <<if _upperClassSexDemand < $NPCSexSupply.upperClass>>
 	<<set _upperClassSexDemand = 0>>
 <<else>>
 	<<set _upperClassSexDemand -= $NPCSexSupply.upperClass>>
 <</if>>
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>NPC Supply Upper Class: $NPCSexSupply.upperClass
-<</if>>
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>Leftover Upper Class SD: <<print _upperClassSexDemand>>
-<</if>>
 
 <<if _topClassSexDemand < $NPCSexSupply.topClass>>
 	<<set _topClassSexDemand = 0>>
 <<else>>
 	<<set _topClassSexDemand -= $NPCSexSupply.topClass>>
 <</if>>
+
 <<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>NPC Supply Top Class: $NPCSexSupply.topClass
-<</if>>
-<<if ($cheatMode == 1) || ($debugMode == 1)>>
-	<br>Leftover Top Class SD: <<print _topClassSexDemand>>
+
+	<br>Slave services supply and demand this week:
+
+	<table class="finance" border ="1">
+		<tr align="center"> /*title row */
+			<th align="right">Client's class</th>
+			<th>Lower</th>
+			<th>Middle</th>
+			<th>Upper</th>
+			<th>Top</th>
+		</tr>
+
+		<tr align="right">
+			<td>
+				Demand
+			</td>
+			<td>
+				<<print commaNum(_lowerClassSexDemandRef)>>
+			</td>
+			<td>
+				<<print commaNum(_middleClassSexDemandRef)>>
+			</td>
+			<td>
+				<<print commaNum(_upperClassSexDemandRef)>>
+			</td>
+			<td>
+				<<print commaNum(_topClassSexDemandRef)>>
+			</td>
+		</tr>
+
+		<tr align="right">
+			<td>
+				Brothel Supply
+			</td>
+			<td>
+				<<print commaNum($slaveJobValues.brothel.lowerClass)>>
+			</td>
+			<td>
+				<<print commaNum($slaveJobValues.brothel.middleClass)>>
+			</td>
+			<td>
+				<<print commaNum($slaveJobValues.brothel.upperClass)>>
+			</td>
+			<td>
+				<<print commaNum($slaveJobValues.brothel.topClass)>>
+			</td>
+		</tr>
+
+		<<if (_clubSupply.lowerClass || _clubSupply.middleClass)>>
+			<tr align="right">
+				<td>
+					Club Supply
+				</td>
+				<td>
+					<<print commaNum(_clubSupply.lowerClass)>>
+				</td>
+				<td>
+					<<print commaNum(_clubSupply.middleClass)>>
+				</td>
+				<td>
+					N/A
+				</td>
+				<td>
+					N/A
+				</td>
+			</tr>
+		<</if>>
+
+		<<if (_arcadeSupply.lowerClass || _arcadeSupply.middleClass || _arcadeSupply.upperClass)>>
+			<tr align="right">
+				<td>
+					Arcade Supply
+				</td>
+				<td>
+					<<print commaNum(_arcadeSupply.lowerClass)>>
+				</td>
+				<td>
+					<<print commaNum(_arcadeSupply.middleClass)>>
+				</td>
+				<td>
+					<<print commaNum(_arcadeSupply.upperClass)>>
+				</td>
+				<td>
+					N/A
+				</td>
+			</tr>
+		<</if>>
+
+		<<if ($cheatMode == 1) || ($debugMode == 1)>>
+			<tr align="right">
+				<td>
+					NPC Supply
+				</td>
+				<td>
+					<<print commaNum($NPCSexSupply.lowerClass)>>
+				</td>
+				<td>
+					<<print commaNum($NPCSexSupply.middleClass)>>
+				</td>
+				<td>
+					<<print commaNum($NPCSexSupply.upperClass)>>
+				</td>
+				<td>
+					<<print commaNum($NPCSexSupply.topClass)>>
+				</td>
+			</tr>
+		<</if>>
+		
+		<tr align="right">
+			<td>
+				Unsatisfied
+			</td>
+			<td>
+				<<print commaNum(_lowerClassSexDemand)>>
+			</td>
+			<td>
+				<<print commaNum(_middleClassSexDemand)>>
+			</td>
+			<td>
+				<<print commaNum(_upperClassSexDemand)>>
+			</td>
+			<td>
+				<<print commaNum(_topClassSexDemand)>>
+			</td>
+		</tr>
+	</table>
 <</if>>
 
 /*Sexual satisfaction effects*/