diff --git a/power-libperfmgr/android.hardware.power@1.2-service.wahoo-libperfmgr.rc b/power-libperfmgr/android.hardware.power@1.2-service.wahoo-libperfmgr.rc
index 06df36a..79ebf7a 100644
--- a/power-libperfmgr/android.hardware.power@1.2-service.wahoo-libperfmgr.rc
+++ b/power-libperfmgr/android.hardware.power@1.2-service.wahoo-libperfmgr.rc
@@ -4,11 +4,11 @@
     group system
 
 # restart powerHAL when framework died
-on property:init.svc.zygote=restarting
-   setprop vendor.powerhal.state 0
+on property:init.svc.zygote=restarting && property:vendor.powerhal.state=*
+   setprop vendor.powerhal.state ""
    restart vendor.power-hal-1-2
 
 # restart powerHAL when cameraHAL died
 on property:init.svc.vendor.camera-provider-2-4=restarting && property:vendor.powerhal.state=VIDEO_ENCODE
-   setprop vendor.powerhal.state 0
+   setprop vendor.powerhal.state ""
    restart vendor.power-hal-1-2
diff --git a/powerhint.json b/powerhint.json
index cf45abc..54885e2 100755
--- a/powerhint.json
+++ b/powerhint.json
@@ -1,19 +1,6 @@
 {
   "Nodes": [
     {
-      "Name": "CPULittleClusterMinFreq",
-      "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
-      "Values": [
-        "1900800",
-        "1555200",
-        "1512000",
-        "1478400",
-        "1134000",
-        "384000"
-      ],
-      "ResetOnInit": true
-    },
-    {
       "Name": "CPULittleClusterMaxFreq",
       "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq",
       "Values": [
@@ -25,15 +12,15 @@
       "ResetOnInit": true
     },
     {
-      "Name": "CPUBigClusterMinFreq",
-      "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
+      "Name": "CPULittleClusterMinFreq",
+      "Path": "/sys/devices/system/cpu/cpu0/cpufreq/scaling_min_freq",
       "Values": [
-        "2457600",
-        "1574400",
-        "1420800",
-        "1344000",
-        "1132800",
-        "300000"
+        "1900800",
+        "1555200",
+        "1512000",
+        "1478400",
+        "1134000",
+        "384000"
       ],
       "ResetOnInit": true
     },
@@ -51,12 +38,15 @@
       "ResetOnInit": true
     },
     {
-      "Name": "GPUMinFreq",
-      "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq",
+      "Name": "CPUBigClusterMinFreq",
+      "Path": "/sys/devices/system/cpu/cpu4/cpufreq/scaling_min_freq",
       "Values": [
-        "515000000",
-        "414000000",
-        "257000000"
+        "2457600",
+        "1574400",
+        "1420800",
+        "1344000",
+        "1132800",
+        "300000"
       ],
       "ResetOnInit": true
     },
@@ -72,6 +62,16 @@
       "ResetOnInit": true
     },
     {
+      "Name": "GPUMinFreq",
+      "Path": "/sys/class/kgsl/kgsl-3d0/devfreq/min_freq",
+      "Values": [
+        "515000000",
+        "414000000",
+        "257000000"
+      ],
+      "ResetOnInit": true
+    },
+    {
       "Name": "GPUBusMinFreq",
       "Path": "/sys/class/devfreq/soc:qcom,gpubw/min_freq",
       "Values": [