diff --git a/template-antminer-s19.yaml b/template-antminer-s19.yaml
index 24ca488..e8bac45 100644
--- a/template-antminer-s19.yaml
+++ b/template-antminer-s19.yaml
@@ -1,6 +1,6 @@
 zabbix_export:
   version: '5.2'
-  date: '2022-04-02T06:26:38Z'
+  date: '2022-04-02T23:35:06Z'
   groups:
     -
       name: 'Antminer S19'
@@ -92,6 +92,42 @@ zabbix_export:
                 - '$[1][''fan2'']'
           master_item:
             key: 'Miner["stats", "{HOST.CONN}", "{$HOST.PORT}"]'
+        -
+          name: Fan3
+          type: DEPENDENT
+          key: AntMinerT17.Fan3
+          delay: '0'
+          history: 1d
+          trends: 1d
+          units: RPM
+          applications:
+            -
+              name: AntMinerT17
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[1][''fan3'']'
+          master_item:
+            key: 'Miner["stats", "{HOST.CONN}", "{$HOST.PORT}"]'
+        -
+          name: Fan4
+          type: DEPENDENT
+          key: AntMinerT17.Fan4
+          delay: '0'
+          history: 1d
+          trends: 1d
+          units: RPM
+          applications:
+            -
+              name: AntMinerT17
+          preprocessing:
+            -
+              type: JSONPATH
+              parameters:
+                - '$[1][''fan4'']'
+          master_item:
+            key: 'Miner["stats", "{HOST.CONN}", "{$HOST.PORT}"]'
         -
           name: Fan_num
           type: DEPENDENT
@@ -488,7 +524,7 @@ zabbix_export:
       priority: DISASTER
       manual_close: 'YES'
     -
-      expression: '(({AntMiner S19:AntMinerT17.Fan1.last()}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan1.last(#2)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan1.last(#3)}<{$FAN_LOW}) or ({AntMiner S19:AntMinerT17.Fan2.last()}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan2.last(#2)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan2.last(#3)}<{$FAN_LOW})) and {AntMiner S19:icmpping.last()}=1'
+      expression: '(({AntMiner S19:AntMinerT17.Fan1.last()}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan1.last(#2)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan1.last(#3)}<{$FAN_LOW}) or ({AntMiner S19:AntMinerT17.Fan2.last()}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan2.last(#2)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan2.last(#3)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan3.last(#2)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan3.last(#3)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan4.last(#2)}<{$FAN_LOW} and {AntMiner S19:AntMinerT17.Fan4.last(#3)}<{$FAN_LOW})) and {AntMiner S19:icmpping.last()}=1'
       name: 'AntMiner S19 low fan speed {HOST.NAME}'
       manual_close: 'YES'
     -
diff --git a/template-antminer-t17.xml b/template-antminer-t17.xml
index 3e0c184..2d4a372 100644
--- a/template-antminer-t17.xml
+++ b/template-antminer-t17.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
     <version>5.2</version>
-    <date>2022-04-02T08:23:36Z</date>
+    <date>2022-04-02T23:45:44Z</date>
     <groups>
         <group>
             <name>Antminer T17</name>
@@ -129,6 +129,56 @@
                         <key>Miner[&quot;stats&quot;, &quot;{HOST.CONN}&quot;, &quot;{$HOST.PORT}&quot;]</key>
                     </master_item>
                 </item>
+                <item>
+                    <name>Fan3</name>
+                    <type>DEPENDENT</type>
+                    <key>AntMinerT17.Fan3</key>
+                    <delay>0</delay>
+                    <history>1d</history>
+                    <trends>1d</trends>
+                    <units>RPM</units>
+                    <applications>
+                        <application>
+                            <name>AntMinerT17</name>
+                        </application>
+                    </applications>
+                    <preprocessing>
+                        <step>
+                            <type>JSONPATH</type>
+                            <parameters>
+                                <parameter>$[1]['fan3']</parameter>
+                            </parameters>
+                        </step>
+                    </preprocessing>
+                    <master_item>
+                        <key>Miner[&quot;stats&quot;, &quot;{HOST.CONN}&quot;, &quot;{$HOST.PORT}&quot;]</key>
+                    </master_item>
+                </item>
+                <item>
+                    <name>Fan4</name>
+                    <type>DEPENDENT</type>
+                    <key>AntMinerT17.Fan4</key>
+                    <delay>0</delay>
+                    <history>1d</history>
+                    <trends>1d</trends>
+                    <units>RPM</units>
+                    <applications>
+                        <application>
+                            <name>AntMinerT17</name>
+                        </application>
+                    </applications>
+                    <preprocessing>
+                        <step>
+                            <type>JSONPATH</type>
+                            <parameters>
+                                <parameter>$[1]['fan4']</parameter>
+                            </parameters>
+                        </step>
+                    </preprocessing>
+                    <master_item>
+                        <key>Miner[&quot;stats&quot;, &quot;{HOST.CONN}&quot;, &quot;{$HOST.PORT}&quot;]</key>
+                    </master_item>
+                </item>
                 <item>
                     <name>Fan_num</name>
                     <type>DEPENDENT</type>
@@ -670,7 +720,7 @@ return $123;</parameter>
             <manual_close>YES</manual_close>
         </trigger>
         <trigger>
-            <expression>(({AntMiner T17:AntMinerT17.Fan1.last()}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan1.last(#2)}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan1.last(#3)}&lt;{$FAN_LOW}) or ({AntMiner T17:AntMinerT17.Fan2.last()}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan2.last(#2)}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan2.last(#3)}&lt;{$FAN_LOW})) and {AntMiner T17:icmpping.last()}=1</expression>
+            <expression>(({AntMiner T17:AntMinerT17.Fan1.last()}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan1.last(#2)}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan1.last(#3)}&lt;{$FAN_LOW}) or ({AntMiner T17:AntMinerT17.Fan2.last()}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan2.last(#2)}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan2.last(#3)}&lt;{$FAN_LOW}) or ({AntMiner T17:AntMinerT17.Fan3.last()}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan3.last(#2)}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan3.last(#3)}&lt;{$FAN_LOW}) or ({AntMiner T17:AntMinerT17.Fan4.last()}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan4.last(#2)}&lt;{$FAN_LOW} and {AntMiner T17:AntMinerT17.Fan4.last(#3)}&lt;{$FAN_LOW})) and {AntMiner T17:icmpping.last()}=1</expression>
             <name>AntMiner T17 low fan speed {HOST.NAME}</name>
             <manual_close>YES</manual_close>
         </trigger>
@@ -690,14 +740,6 @@ return $123;</parameter>
             <priority>INFO</priority>
             <manual_close>YES</manual_close>
         </trigger>
-        <trigger>
-            <expression>({AntMiner T17:AntMinerT17.Fan_num.last()}=0) and ({AntMiner T17:icmpping.last()}=1) and ({AntMiner T17:AntMinerT17.Elapsed.last()}={AntMiner T17:AntMinerT17.Elapsed.prev()}) and ({AntMiner T17:AntMinerT17.Elapsed.last()}&gt;0)</expression>
-            <recovery_mode>RECOVERY_EXPRESSION</recovery_mode>
-            <recovery_expression>{AntMiner T17:AntMinerT17.Fan_num.last()}=2</recovery_expression>
-            <name>Асик завис !!!</name>
-            <status>DISABLED</status>
-            <manual_close>YES</manual_close>
-        </trigger>
     </triggers>
     <value_maps>
         <value_map>