diff --git a/app/Ally/AllyControl.cs b/app/Ally/AllyControl.cs
index 9527a7e7..e8c5ee12 100644
--- a/app/Ally/AllyControl.cs
+++ b/app/Ally/AllyControl.cs
@@ -4,6 +4,7 @@ using GHelper.Input;
 using GHelper.Mode;
 using GHelper.USB;
 using HidSharp;
+using System.Diagnostics;
 using System.Text;
 
 namespace GHelper.Ally
@@ -348,37 +349,44 @@ namespace GHelper.Ally
 
             if (autoTDP && fpsLimit > 0 && fpsLimit <= 120)
             {
-                if (fps <= Math.Max(fpsLimit - 5, fpsLimit * 0.8)) _upCount++;
+                int power = (int)amdControl.GetGpuPower();
+                //Debug.WriteLine($"{power}: {fps}");
+
+                if (fps <= fpsLimit * 0.8) _upCount++;
                 else _upCount = 0;
 
-                if (fps >= Math.Min(fpsLimit - 1, fpsLimit * 0.95)) _downCount++;
+                if (fps >= fpsLimit * 0.90) _downCount++;
                 else _downCount = 0;
 
+                var tdp = GetTDP();
                 if (_upCount >= 1)
                 {
                     _downCount = 0;
                     _upCount = 0;
-                    SetTDP(GetTDP() + 1, $"AutoTDP+ {fps}");
+                    SetTDP(tdp + 1, $"AutoTDP+ [{power}]{fps}");
                 }
 
-                if (_downCount >= 8)
+                if (_downCount >= 8 && power < tdp)
                 {
                     _upCount = 0;
                     _downCount--;
-                    SetTDP(GetTDP() - 1, $"AutoTDP- {fps}");
+                    SetTDP(tdp - 1, $"AutoTDP- [{power}]{fps}");
                 }
             }
 
-            ControllerMode newMode = (fps > 0) ? ControllerMode.Gamepad : ControllerMode.Mouse;
-
-            if (_applyMode != newMode) _autoCount++;
-            else _autoCount = 0;
-
-            if (_autoCount > 2)
+            if (_mode == ControllerMode.Auto)
             {
-                _autoCount = 0;
-                ApplyMode(newMode);
-                Logger.WriteLine($"Controller Mode {fps}: {newMode}");
+                ControllerMode newMode = (fps > 0) ? ControllerMode.Gamepad : ControllerMode.Mouse;
+
+                if (_applyMode != newMode) _autoCount++;
+                else _autoCount = 0;
+
+                if (_autoCount > 2)
+                {
+                    _autoCount = 0;
+                    ApplyMode(newMode);
+                    Logger.WriteLine($"Controller Mode {fps}: {newMode}");
+                }
             }
 
         }
diff --git a/app/Gpu/AMD/AmdGpuControl.cs b/app/Gpu/AMD/AmdGpuControl.cs
index 6583f12a..e10bf191 100644
--- a/app/Gpu/AMD/AmdGpuControl.cs
+++ b/app/Gpu/AMD/AmdGpuControl.cs
@@ -119,6 +119,18 @@ public class AmdGpuControl : IGpuControl
 
     }
 
+    public int? GetGpuPower()
+    {
+        if (_adlContextHandle == nint.Zero || _iGPU == null) return null;
+        if (ADL2_New_QueryPMLogData_Get(_adlContextHandle, ((ADLAdapterInfo)_iGPU).AdapterIndex, out ADLPMLogDataOutput adlpmLogDataOutput) != Adl2.ADL_SUCCESS) return null;
+
+        ADLSingleSensorData gpuUsage = adlpmLogDataOutput.Sensors[(int)ADLSensorType.PMLOG_ASIC_POWER];
+        if (gpuUsage.Supported == 0) return null;
+
+        return gpuUsage.Value;
+
+    }
+
 
     public bool SetVariBright(int enabled)
     {