--- Libc/Libc-583/sys/OSThermalNotification.c
+++ Libc/Libc-825.26/sys/OSThermalNotification.c
@@ -21,24 +21,90 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
+#include <dispatch/dispatch.h>
 #include <libkern/OSThermalNotification.h>
 #include <notify.h>
 
-const char *kOSThermalNotificationName = "com.apple.system.thermalstatus";
+#define OSThermalStatusName "com.apple.system.thermalstatus"
+
+const char * const kOSThermalNotificationName = OSThermalStatusName; 
+
+static const char * const kOSThermalMitigationNames[kOSThermalMitigationCount] = {
+	OSThermalStatusName,
+	"com.apple.system.thermalmitigation.70percenttorch",
+	"com.apple.system.thermalmitigation.70percentbacklight",
+	"com.apple.system.thermalmitigation.50percenttorch",
+	"com.apple.system.thermalmitigation.50percentbacklight",
+	"com.apple.system.thermalmitigation.disabletorch",
+	"com.apple.system.thermalmitigation.25percentbacklight",
+	"com.apple.system.thermalmitigation.disablemapshalo",
+	"com.apple.system.thermalmitigation.appterminate",
+	"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_get_state(tokens[behavior], &val);
+	}
+	return (OSThermalNotificationLevel)val;
+}
+
+void _OSThermalNotificationSetLevelForBehavior(int level, int behavior)
+{
+	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_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)
 {
-	uint64_t val;
-	int token;
+	if (thermalLevelsReady) {
+		return _OSThermalNotificationLevelForBehavior(kOSThermalMitigationNone);
+	}
 
-	if (NOTIFY_STATUS_OK != notify_register_check(kOSThermalNotificationName, &token))
-		return OSThermalNotificationLevelAny;
+	uint64_t tableReady = 0;
 
-	if (NOTIFY_STATUS_OK != notify_get_state(token, &val))
-		return OSThermalNotificationLevelAny;
+	dispatch_once(&predicates[kOSThermalMitigationThermalTableReady], ^{
+		(void)notify_register_check(kOSThermalMitigationNames[kOSThermalMitigationThermalTableReady], &tokens[kOSThermalMitigationThermalTableReady]);
+	});
+	(void)notify_get_state(tokens[kOSThermalMitigationThermalTableReady], &tableReady);
 
-	if (NOTIFY_STATUS_OK != notify_cancel(token))
-		return OSThermalNotificationLevelAny;
+	// 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;
+	}
 
-	return (OSThermalNotificationLevel)val;
+	// Not ready returns -1, which should not be equal or greater than any other thermal state. 
+	return OSThermalNotificationLevelAny;
 }