diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf
index 4112eaf..d4cde92 100644
--- a/configs/thermal-engine.conf
+++ b/configs/thermal-engine.conf
@@ -18,234 +18,244 @@
 #Conf file: system/vendor/etc/thermal-engine.conf
 
 [VIRTUAL-CPUS]
-#algo_type virtual
-trip_sensor apc0-cpu0-usr
-set_point 75000
-set_point_clr 65000
-sensors apc0-cpu0-usr apc0-cpu1-usr apc0-cpu2-usr apc0-cpu3-usr apc0-l2-usr apc1-cpu0-usr apc1-cpu1-usr apc1-cpu2-usr apc1-cpu3-usr apc1-l2-usr
+#algo_type        virtual
+trip_sensor       apc0-cpu0-usr
+set_point         75000
+set_point_clr     65000
+sensors           apc0-cpu0-usr apc0-cpu1-usr apc0-cpu2-usr apc0-cpu3-usr apc0-l2-usr apc1-cpu0-usr apc1-cpu1-usr apc1-cpu2-usr apc1-cpu3-usr apc1-l2-usr
 weights
-sampling 50
-math 2
+sampling          50
+math              2
 
 [SS-GPU]
-#algo_type ss
-sampling 250
-sensor gpu0-usr gpu1-usr
-device gpu
-set_point 95000
-set_point_clr 65000
-time_constant 0
+#algo_type        ss
+sampling          250
+sensors           gpu0-usr   gpu1-usr
+device            gpu
+set_point         95000
+set_point_clr     65000
+time_constant     0
 
 [SS-CASE-THERM]
-#algo_type ss
-sampling 10000
-sensor case_therm
-device cluster0
-set_point 43000
-set_point_clr 40000
-time_constant 0
-device_max_limit 1689600
+#algo_type        ss
+sampling          10000
+sensor            case-therm-adc
+device            cluster0
+set_point         43000
+set_point_clr     40000
+time_constant     0
+device_max_limit  1689600
 
 [SS-CPUS-ALL]
-#algo_type ss
-sampling 50
-sensor VIRTUAL-CPUS
-device cluster0
-set_point 95000
-set_point_clr 55000
-time_constant 0
+#algo_type        ss
+sampling          50
+sensor            VIRTUAL-CPUS
+device            cluster0
+set_point         95000
+set_point_clr     55000
+time_constant     0
 
 [SPEAKER-CAL]
-sampling 30000 30000 10 1800000
-sensor pm8953_tz
-sensors qdsp-usr gpu0-usr gpu1-usr
-temp_range 6000 10000 2000
-max_temp 45000
-offset -4000
+sampling          30000  30000  10  1800000
+sensor            pm8953_tz
+sensors           qdsp-usr gpu0-usr gpu1-usr
+temp_range        6000   10000   2000
+max_temp          45000
+offset            -4000
+
+[MONITOR-CAMERA-MSM]
+algo_type         monitor
+sampling          1000
+sensors           camera-usr mdm-core-user
+thresholds        52000        56000
+thresholds_clr    47000        53000
+actions           camera       camera
+action_info       1            2
 
 [MODEM_PA_MITIGATION]
-#algo_type monitor
-sampling 10000
-sensor case_therm
-thresholds 70000 70000
-thresholds_clr 69000 69000
-actions modem modem
-action_info 2 3
+#algo_type        monitor
+sampling          10000
+sensor            case-therm-adc
+thresholds        70000      70000
+thresholds_clr    69000      69000
+actions           modem      modem
+action_info       2          3
 
 [MODEM_PROC_TEMP_MITIGATION]
-#algo_type monitor
-sampling 10000
-sensor case_therm
-thresholds 70000 70000
-thresholds_clr 69000 69000
-actions modem_proc modem_proc
-action_info 1 3
+#algo_type        monitor
+sampling          10000
+sensor            case-therm-adc
+thresholds        70000      70000
+thresholds_clr    69000      69000
+actions           modem_proc modem_proc
+action_info       1          3
 
 [BATTERY_CHARGING_CTL]
-#algo_type monitor
-sampling 10000
-sensor case-therm-adc chg-temp-adc
-thresholds 38000 40000 43000 48000
-thresholds_clr 35000 38000 40000 43000
-actions battery battery battery battery
-action_info 2 3 4 5
+#algo_type        monitor
+sampling          10000
+sensors           case-therm-adc chg-temp-adc pa-therm0 mdm-core-usr
+thresholds        38000 40000 43000 48000
+thresholds_clr    35000 38000 40000 43000
+actions           battery battery battery battery
+action_info       2 3 4 5
 
 [VDD_RSTR_MONITOR-GPU]
-#algo_type monitor
-sampling 1000
-sensor gpu0-usr gpu1-usr gpu
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensors           gpu0-usr gpu1-usr gpu
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
-[VDD_RSTR_MONITOR-TSENS14]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor14
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
-descending
+# idk which sensor is this yet.
+#[VDD_RSTR_MONITOR-TSENS14]
+#algo_type        monitor
+#sampling          1000
+#sensor            tsens_tz_sensor14 
+#thresholds        5000
+#thresholds_clr    10000
+#actions           vdd_restriction
+#action_info       1
+#descending
 
 [VDD_RSTR_MONITOR-TSENS13]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor13
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc0-l2-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS12]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor12
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc0-cpu3-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS11]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor11
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc0-cpu2-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS10]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor10
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc0-cpu1-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS9]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor9
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc0-cpu0-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS8]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor8
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc1-l2-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS7]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor7
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc1-cpu3-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS6]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor6
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc1-cpu2-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS5]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor5
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc1-cpu1-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS4]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor4
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            apc1-cpu0-usr
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS3]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor3
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            tsens_tz_sensor3
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS2]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor2
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            tsens_tz_sensor2
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS1]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor1
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            tsens_tz_sensor1
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
 
 [VDD_RSTR_MONITOR-TSENS0]
-#algo_type monitor
-sampling 1000
-sensor tsens_tz_sensor0
-thresholds 5000
-thresholds_clr 10000
-actions vdd_restriction
-action_info 1
+#algo_type        monitor
+sampling          1000
+sensor            tsens_tz_sensor0
+thresholds        5000
+thresholds_clr    10000
+actions           vdd_restriction
+action_info       1
 descending
diff --git a/rootdir/etc/init.qcom.post_boot.sh b/rootdir/etc/init.qcom.post_boot.sh
index ed00115..5ae6a1b 100644
--- a/rootdir/etc/init.qcom.post_boot.sh
+++ b/rootdir/etc/init.qcom.post_boot.sh
@@ -423,11 +423,7 @@ else
     fi
 
     # Set allocstall_threshold to 0 for all targets.
-    # Set swappiness to 100 for all targets
     echo 0 > /sys/module/vmpressure/parameters/allocstall_threshold
-    echo 100 > /proc/sys/vm/swappiness
-
-    configure_zram_parameters
 
     configure_read_ahead_kb_values
 
diff --git a/rootdir/init.qcom.rc b/rootdir/init.qcom.rc
index 7554be0..4897c05 100644
--- a/rootdir/init.qcom.rc
+++ b/rootdir/init.qcom.rc
@@ -667,3 +667,6 @@ service vendor.audio-hal-2-0 /vendor/bin/hw/android.hardware.audio@2.0-service
     oneshot
     interface android.hardware.audio@4.0::IDevicesFactory default
     interface android.hardware.audio@2.0::IDevicesFactory default
+	
+on property:dev.bootcomplete=1
+    swapon_all /vendor/etc/fstab.qcom