--- Libc/Libc-763.13/sys/OSThermalNotification.c
+++ Libc/Libc-825.24/sys/OSThermalNotification.c
@@ -39,18 +39,20 @@
 	"com.apple.system.thermalmitigation.25percentbacklight",
 	"com.apple.system.thermalmitigation.disablemapshalo",
 	"com.apple.system.thermalmitigation.appterminate",
-	"com.apple.system.thermalmitigation.devicerestart"
+	"com.apple.system.thermalmitigation.devicerestart",
+	"com.apple.system.thermalmitigation.thermaltableready"
 };
 
 static int tokens[kOSThermalMitigationCount];
 static dispatch_once_t predicates[kOSThermalMitigationCount];
+static bool thermalLevelsReady = false;
 
 OSThermalNotificationLevel _OSThermalNotificationLevelForBehavior(int behavior)
 {
 	uint64_t val = OSThermalNotificationLevelAny;
 	if (behavior >= 0 && behavior < kOSThermalMitigationCount) {
 		dispatch_once(&predicates[behavior], ^{
-				(void)notify_register_check(kOSThermalMitigationNames[behavior], &tokens[behavior]);
+			(void)notify_register_check(kOSThermalMitigationNames[behavior], &tokens[behavior]);
 		});
 		(void)notify_get_state(tokens[behavior], &val);
 	}
@@ -62,14 +64,47 @@
 	uint64_t val = (uint64_t)level;
 	if (behavior >= 0 && behavior < kOSThermalMitigationCount) {
 		dispatch_once(&predicates[behavior], ^{
-				(void)notify_register_check(kOSThermalMitigationNames[behavior], &tokens[behavior]);
+			(void)notify_register_check(kOSThermalMitigationNames[behavior], &tokens[behavior]);
 		});
 		(void)notify_set_state(tokens[behavior], val);
+
+		// Note:  
+		// - We are ready when we program in the appterminate value. 
+		// - Assumes that user programs kOSThermalMitigationNone level less than 
+		//   kOSThermalMitigationAppTerminate & kOSThermalMitigationDeviceRestart  
+		if (behavior == kOSThermalMitigationAppTerminate) {
+			dispatch_once(&predicates[kOSThermalMitigationThermalTableReady], ^{
+				(void)notify_register_check(kOSThermalMitigationNames[kOSThermalMitigationThermalTableReady], &tokens[kOSThermalMitigationThermalTableReady]);
+			});
+			(void)notify_set_state(tokens[kOSThermalMitigationThermalTableReady], kOSThermalMitigationCount);
+		}
 	}
 }
 
 
 OSThermalNotificationLevel OSThermalNotificationCurrentLevel(void)
 {
-	return _OSThermalNotificationLevelForBehavior(kOSThermalMitigationNone);
+	if (thermalLevelsReady) {
+		return _OSThermalNotificationLevelForBehavior(kOSThermalMitigationNone);
+	}
+
+	uint64_t tableReady = 0;
+
+	dispatch_once(&predicates[kOSThermalMitigationThermalTableReady], ^{
+		(void)notify_register_check(kOSThermalMitigationNames[kOSThermalMitigationThermalTableReady], &tokens[kOSThermalMitigationThermalTableReady]);
+	});
+	(void)notify_get_state(tokens[kOSThermalMitigationThermalTableReady], &tableReady);
+
+	// If we are ready then optimize this so we don't call dispatch everytime.
+	if (tableReady == kOSThermalMitigationCount) {
+		thermalLevelsReady = true;
+		return _OSThermalNotificationLevelForBehavior(kOSThermalMitigationNone); 
+	}
+	else {
+		// Allow reset so we can dynamically change the table without thermal trap screen appearing. 
+		thermalLevelsReady = false;
+	}
+
+	// Not ready returns -1, which should not be equal or greater than any other thermal state. 
+	return OSThermalNotificationLevelAny;
 }