From e2f76d811f34fb4d8a476ad4162f805d0a87864c Mon Sep 17 00:00:00 2001
From: Marko Oldenburg <leongaultier@gmail.com>
Date: Sat, 10 Feb 2018 03:32:53 +0100
Subject: [PATCH] new tesker flowset, add sms sender to Reading
 incommingSmsMassage

---
 73_AMADCommBridge.pm                          |   2 +-
 74_AMADDevice.pm                              |   2 +-
 ...ml => 74_AMADautomagicFlowset_4.1.99.8.xml | 824 +++++++++---------
 ...j.xml => 74_AMADtaskerset_4.1.99.8.prj.xml |   0
 4 files changed, 414 insertions(+), 414 deletions(-)
 rename 74_AMADautomagicFlowset_4.1.99.7.xml => 74_AMADautomagicFlowset_4.1.99.8.xml (90%)
 rename 74_AMADtaskerset_4.1.99.6.prj.xml => 74_AMADtaskerset_4.1.99.8.prj.xml (100%)

diff --git a/73_AMADCommBridge.pm b/73_AMADCommBridge.pm
index 6a04148..0d673b8 100644
--- a/73_AMADCommBridge.pm
+++ b/73_AMADCommBridge.pm
@@ -75,7 +75,7 @@ eval "use JSON;1" or $missingModul .= "JSON ";
 
 
 my $modulversion = "4.1.99.30";
-my $flowsetversion = "4.1.99.7";
+my $flowsetversion = "4.1.99.8";
 
 
 
diff --git a/74_AMADDevice.pm b/74_AMADDevice.pm
index 3916071..91e0e52 100644
--- a/74_AMADDevice.pm
+++ b/74_AMADDevice.pm
@@ -59,7 +59,7 @@ eval "use JSON;1" or $missingModul .= "JSON ";
 
 
 my $modulversion = "4.1.99.40";
-my $flowsetversion = "4.1.99.7";
+my $flowsetversion = "4.1.99.8";
 
 
 
diff --git a/74_AMADautomagicFlowset_4.1.99.7.xml b/74_AMADautomagicFlowset_4.1.99.8.xml
similarity index 90%
rename from 74_AMADautomagicFlowset_4.1.99.7.xml
rename to 74_AMADautomagicFlowset_4.1.99.8.xml
index 262c60f..21eeb3e 100644
--- a/74_AMADautomagicFlowset_4.1.99.7.xml
+++ b/74_AMADautomagicFlowset_4.1.99.8.xml
@@ -3060,8 +3060,8 @@ fhemcmd = "setreading";</script>
   </action>
   <action type="script">
     <useDefaultName>true</useDefaultName>
-    <name>Script: incommingSmsText = "\"incommingSmsText\":" + " \"" + replaceAll({sms_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</name>
-    <script>incommingSmsText = "\"incommingSmsText\":" + " \"" + replaceAll({sms_text}, "\\n", " ") + "\"";
+    <name>Script: incommingSmsText = "\"incommingSmsText\":" + " \"" + {sms_sender} + " - " + replaceAll({sms_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</name>
+    <script>incommingSmsText = "\"incommingSmsText\":" + " \"" + {sms_sender} + " - " + replaceAll({sms_text}, "\\n", " ") + "\"";
 fhemcmd = "setreading";</script>
   </action>
   <action type="script">
@@ -3290,7 +3290,7 @@ fhemcmd = "setreading";</script>
   <action type="script">
     <useDefaultName>false</useDefaultName>
     <name>Script: Set FHEMDATA JSON</name>
-    <script>fhemdata = "\"flowsetVersionAtDevice\": \"4.1.99.7\",";
+    <script>fhemdata = "\"flowsetVersionAtDevice\": \"4.1.99.8\",";
 
 
 
@@ -4001,7 +4001,7 @@ Soll der Assistent gelöscht werden?</text>
   </action>
   <flow type="flow">
     <name>First Run Assistant</name>
-    <group>AMADNG Info/Control Flowset v4.1.99.7</group>
+    <group>AMADNG Info/Control Flowset v4.1.99.8</group>
     <enabled>false</enabled>
     <executionPolicy>PARALLEL</executionPolicy>
     <triggercontainer id="t1" x="35.0" y="-2292.5">
@@ -4174,184 +4174,11 @@ Soll der Assistent gelöscht werden?</actioncontainer>
   </flow>
   <flow type="flow">
     <name>Informations</name>
-    <group>AMADNG Info/Control Flowset v4.1.99.7</group>
+    <group>AMADNG Info/Control Flowset v4.1.99.8</group>
     <enabled>true</enabled>
     <executionPolicy>QUEUE</executionPolicy>
     <emergencyStopCount>900</emergencyStopCount>
-    <actioncontainer id="t1" x="1085.0" y="-3482.5">Script: daydream_state = "on"</actioncontainer>
-    <actioncontainer id="t2" x="1225.0" y="-3482.5">Script: daydream_state = "off"</actioncontainer>
-    <conditioncontainer id="t3" x="1855.0" y="-3027.5">Display Orientierung: Portrait</conditioncontainer>
-    <actioncontainer id="t4" x="1785.0" y="-3272.5">Script: screen_orientation = "portrait"</actioncontainer>
-    <actioncontainer id="t5" x="1925.0" y="-3272.5">Script: screen_orientation = "landscape"</actioncontainer>
-    <actioncontainer id="t6" x="2730.0" y="-3482.5">Script: dock_state = "docked"</actioncontainer>
-    <actioncontainer id="t7" x="2870.0" y="-3482.5">Script: dock_state = "undocked"</actioncontainer>
-    <actioncontainer id="t8" x="1925.0" y="-3657.5">Script: screen_orientation_mode = "manual"</actioncontainer>
-    <conditioncontainer id="t9" x="-1855.0" y="-3832.5">Expression: scrcount &lt; 5</conditioncontainer>
-    <actioncontainer id="t10" x="-1855.0" y="-3657.5">Script: scrcount = scrcount + 1</actioncontainer>
-    <actioncontainer id="t11" x="-1855.0" y="-3517.5">Pause: 2s (Gerät wach halten)</actioncontainer>
-    <conditioncontainer id="t12" x="2800.0" y="-3132.5">Dock Status: Docked</conditioncontainer>
-    <conditioncontainer id="t13" x="1855.0" y="-3482.5">Display automatisch drehen eingeschaltet</conditioncontainer>
-    <conditioncontainer id="t14" x="1155.0" y="-3132.5">Expression: trigger == "Daydream Status: Gestartet"</conditioncontainer>
-    <conditioncontainer id="t15" x="-455.0" y="-3097.5">Bluetooth eingeschaltet</conditioncontainer>
-    <conditioncontainer id="t16" x="-1610.0" y="-3342.5">Keyguard gesperrt</conditioncontainer>
-    <conditioncontainer id="t17" x="-1855.0" y="-3342.5">Expression: keyguard == "locked"</conditioncontainer>
-    <conditioncontainer id="t18" x="3150.0" y="-3132.5">Expression: getAndroidSDKVersion() &gt;= "16"</conditioncontainer>
-    <conditioncontainer id="t19" x="-1610.0" y="-3657.5">Display eingeschaltet</conditioncontainer>
-    <conditioncontainer id="t20" x="-2100.0" y="-3657.5">Display eingeschaltet</conditioncontainer>
-    <conditioncontainer id="t21" x="-2100.0" y="-3097.5">Expression: getAndroidSDKVersion() &gt;= "16"</conditioncontainer>
-    <conditioncontainer id="t22" x="-2730.0" y="-3342.5">Unterbrechnungen-Modus: Nur Wecker (Android 6+)</conditioncontainer>
-    <conditioncontainer id="t23" x="-2870.0" y="-3342.5">Unterbrechnungen-Modus: Keine / Nicht unterbrechen</conditioncontainer>
-    <conditioncontainer id="t24" x="-3010.0" y="-3342.5">Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen</conditioncontainer>
-    <conditioncontainer id="t25" x="-3150.0" y="-3342.5">Unterbrechnungen-Modus: Alle / Immer unterbrechen</conditioncontainer>
-    <actioncontainer id="t26" x="-3150.0" y="-3552.5">Script: dndValue = "always"</actioncontainer>
-    <actioncontainer id="t27" x="-3010.0" y="-3552.5">Script: dndValue = "onlyImportant"</actioncontainer>
-    <actioncontainer id="t28" x="-2870.0" y="-3552.5">Script: dndValue = "never"</actioncontainer>
-    <actioncontainer id="t29" x="-2730.0" y="-3552.5">Script: dndValue = "alarmClockOnly"</actioncontainer>
-    <actioncontainer id="t30" x="-2030.0" y="-3832.5">Script: screen_state = "off"</actioncontainer>
-    <actioncontainer id="t31" x="-1680.0" y="-3832.5">Script: screen_state = "on {keyguard}"</actioncontainer>
-    <actioncontainer id="t32" x="-1540.0" y="-3832.5">Script: screen_state = "off {keyguard}"</actioncontainer>
-    <actioncontainer id="t33" x="-1225.0" y="-3657.5">Script: airplanemode = "off"</actioncontainer>
-    <actioncontainer id="t34" x="-455.0" y="-3342.5">Script: bluetooth_state = "on"</actioncontainer>
-    <actioncontainer id="t35" x="1260.0" y="1207.5">Script: androidVersion = "not supported funktion"</actioncontainer>
-    <conditioncontainer id="t36" x="3395.0" y="-2047.5">App Task läuft: {global_activetask} (neuster)</conditioncontainer>
-    <actioncontainer id="t37" x="3465.0" y="-2257.5">Script: runTask = "1"</actioncontainer>
-    <actioncontainer id="t38" x="3325.0" y="-2257.5">Script: runTask = "0"</actioncontainer>
-    <conditioncontainer id="t39" x="3115.0" y="-2047.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
-    <actioncontainer id="t40" x="3115.0" y="-2257.5">Script: runTask = "not supported android version"</actioncontainer>
-    <actioncontainer id="t41" x="2905.0" y="-2292.5">Script: runTask = "null"</actioncontainer>
-    <conditioncontainer id="t42" x="3185.0" y="-1872.5">Expression: global_activetask != null</conditioncontainer>
-    <conditioncontainer id="t43" x="-1855.0" y="-2782.5">Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t44" x="1155.0" y="-2782.5">Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt"</conditioncontainer>
-    <conditioncontainer id="t45" x="1855.0" y="-2782.5">Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t46" x="840.0" y="-2782.5">Expression: trigger == "Akku Ladestand: grösser als 0%"</conditioncontainer>
-    <conditioncontainer id="t47" x="-245.0" y="997.5">Stromversorgung: Angeschlossen</conditioncontainer>
-    <actioncontainer id="t48" x="1785.0" y="-3657.5">Script: screen_orientation_mode = "auto"</actioncontainer>
-    <actioncontainer id="t49" x="-455.0" y="-3552.5">Script: bluetooth_state = "off"</actioncontainer>
-    <conditioncontainer id="t50" x="3220.0" y="-3307.5">Keyguard mit Sicherheit</conditioncontainer>
-    <conditioncontainer id="t51" x="3535.0" y="-2782.5">Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle"</conditioncontainer>
-    <conditioncontainer id="t52" x="-1120.0" y="-2782.5">Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t53" x="1505.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System screen_brightness"</conditioncontainer>
-    <conditioncontainer id="t54" x="105.0" y="1102.5">Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution)</conditioncontainer>
-    <actioncontainer id="t55" x="35.0" y="1207.5">Script: volume = {volumeBT}</actioncontainer>
-    <actioncontainer id="t56" x="-770.0" y="-3342.5">Pause: 2s (Gerät wach halten)</actioncontainer>
-    <conditioncontainer id="t57" x="-770.0" y="-3167.5">Musik Aktiv</conditioncontainer>
-    <actioncontainer id="t58" x="735.0" y="1417.5">Benachrichtigung auf Bildschirm: [AMAD2] Nicht mehr benötigte AMAD Flows wurden entfernt! (lange)</actioncontainer>
-    <conditioncontainer id="t59" x="210.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System volume_music_bt_a2dp" or trigger == "Systemeinstellung verändert: System volume_music_speaker" or trigger == "Systemeinstellung verändert: System volume_music_headphone" or trigger == "Systemeinstellung verändert: System volume_music_headset"</conditioncontainer>
-    <actioncontainer id="t60" x="35.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2</actioncontainer>
-    <actioncontainer id="t61" x="175.0" y="1207.5">Script: volume = {volumeSP}</actioncontainer>
-    <actioncontainer id="t62" x="175.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2</actioncontainer>
-    <conditioncontainer id="t63" x="-2940.0" y="-2782.5">Expression: trigger == "Unterbrechnungen-Modus: Alle / Immer unterbrechen" or trigger == "Unterbrechnungen-Modus: Keine / Nicht unterbrechen" or trigger == "Unterbrechnungen-Modus: Nur Wecker (Android 6+)" or trigger == "Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t64" x="-2940.0" y="-3097.5">Expression: getAndroidSDKVersion() &gt;= "21"</conditioncontainer>
-    <actioncontainer id="t65" x="-1120.0" y="-3097.5">Script: airpcount = 0</actioncontainer>
-    <conditioncontainer id="t66" x="-1225.0" y="-3342.5">Host erreichbar: {global_fhemip}:{global_bridgeport}</conditioncontainer>
-    <actioncontainer id="t67" x="3885.0" y="-997.5">WLAN Reassoziieren</actioncontainer>
-    <conditioncontainer id="t68" x="1015.0" y="157.5">Expression: global_fhemip != null or global_bridgeport != null</conditioncontainer>
-    <conditioncontainer id="t69" x="3885.0" y="-3132.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
-    <actioncontainer id="t70" x="3745.0" y="-3482.5">Script: notification_text = "Aktiviere Automagic unter Einstellungen -&gt; Benachrichtigungen -&gt; Benachrichtigungszugriff"</actioncontainer>
-    <actioncontainer id="t71" x="4025.0" y="-3482.5">Script: notification_text = "not supported from your device"</actioncontainer>
-    <conditioncontainer id="t72" x="3885.0" y="-2782.5">Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp"</conditioncontainer>
-    <conditioncontainer id="t73" x="3885.0" y="-3482.5">Benachrichtigung in Statusbar angezeigt: WhatsApp</conditioncontainer>
-    <actioncontainer id="t74" x="-875.0" y="997.5">Initialisiere Variable Systemeinstellung: screenBrightness</actioncontainer>
-    <actioncontainer id="t75" x="-455.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeNotification</actioncontainer>
-    <conditioncontainer id="t76" x="-770.0" y="-2782.5">Expression: trigger == "Medien Session verändert" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t77" x="3885.0" y="-1592.5">WLAN verfügbar: {global_apssid}</conditioncontainer>
-    <actioncontainer id="t78" x="4795.0" y="-3832.5">Script: intentRadioState = "\"intentRadioState\":" + " \"" + {irstate} + "\"" + "," + "\"intentRadioName\":" + " \"" + {irname} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t79" x="2800.0" y="-3832.5">Script: dockingState = "\"dockingState\":" + " \"" + {dock_state} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t80" x="1855.0" y="-3832.5">Script: screenOrientation = "\"screenOrientation\":" + " \"" + {screen_orientation} + "\"" + "," + "\"screenOrientationMode\":" + " \"" + {screen_orientation_mode} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t81" x="1505.0" y="-3832.5">Script: screenBrightness = "\"screenBrightness\":" + " \"" + {screenBrightness} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t82" x="0.0" y="-3832.5">Script: volumeNotification = "\"volumeNotification\":" + " \"" + {volumeNotification} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t83" x="-1120.0" y="-3832.5">Script: airplanemode = "\"airplanemode\":" + " \"" + {airplanemode} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t84" x="3220.0" y="-2467.5">Script: checkActiveTask = "\"checkActiveTask\":" + " \"" + {runTask} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <conditioncontainer id="t85" x="595.0" y="1417.5">Expression: Leon == "Gaultier"</conditioncontainer>
-    <actioncontainer id="t86" x="665.0" y="1207.5">Flows löschen: MultimediaControl</actioncontainer>
-    <conditioncontainer id="t87" x="2310.0" y="-2782.5">Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t88" x="2310.0" y="-3027.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
-    <actioncontainer id="t89" x="2170.0" y="-3482.5">Script: notification_text = "Aktiviere Automagic unter Einstellungen -&gt; Benachrichtigungen -&gt; Benachrichtigungszugriff"</actioncontainer>
-    <conditioncontainer id="t90" x="2310.0" y="-3482.5">Benachrichtigung in Statusbar angezeigt: Automagic</conditioncontainer>
-    <actioncontainer id="t91" x="4270.0" y="-892.5">Script: deviceState = "\"deviceState\": \"online\""; fhemcmd = "setreading";</actioncontainer>
-    <conditioncontainer id="t92" x="2800.0" y="-2782.5">Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <actioncontainer id="t93" x="1015.0" y="-4602.5">Flows ausführen: Send Data to AMADCommBridge</actioncontainer>
-    <actioncontainer id="t94" x="-455.0" y="-3832.5">Script: bluetooth = "\"bluetooth\":" + " \"" + {bluetooth_state} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t95" x="-315.0" y="-3552.5">Script: connected_devices_names = "none"; connected_devices_addresses = "none"</actioncontainer>
-    <actioncontainer id="t96" x="-315.0" y="-3832.5">Script: btdeviceinfo = "\"connectedBTdevices\":" + " \"" + {connected_devices_names} + "\"" + "," + "\"connectedBTdevicesMAC\":" + " \"" + {connected_devices_addresses} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <conditioncontainer id="t97" x="-315.0" y="-3097.5">Bluetooth Gerät verbunden: Beliebiges Geräte</conditioncontainer>
-    <conditioncontainer id="t98" x="-420.0" y="-2782.5">Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Gerät verbunden: Alle Geräte" or trigger == "Bluetooth Gerät getrennt: Alle Geräte" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <actioncontainer id="t99" x="-1120.0" y="-2327.5">Script: flow_SetCommands = "\"flow_SetCommands\":" + " \"" + {setCommandFlow_state} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t100" x="-1120.0" y="-2152.5">Setze Flow Status: Aktivieren SetCommands</actioncontainer>
-    <actioncontainer id="t101" x="-1015.0" y="-1977.5">Script: setCommandFlow_state = "aktiv"</actioncontainer>
-    <actioncontainer id="t102" x="-1225.0" y="-1977.5">Script: setCommandFlow_state = "inaktiv"</actioncontainer>
-    <conditioncontainer id="t103" x="-1120.0" y="-1802.5">Flow Aktiv: SetCommands</conditioncontainer>
-    <conditioncontainer id="t104" x="-1120.0" y="-1557.5">Expression: trigger == "Periodischer Timer: alle 120s"</conditioncontainer>
-    <conditioncontainer id="t105" x="-1855.0" y="-1802.5">Expression: global_userflowstate != "none"</conditioncontainer>
-    <conditioncontainer id="t106" x="-1855.0" y="-1977.5">Flow Aktiv: {global_userflowstate}</conditioncontainer>
-    <actioncontainer id="t107" x="-1925.0" y="-2152.5">Script: flowState = "inactive"</actioncontainer>
-    <actioncontainer id="t108" x="-1785.0" y="-2152.5">Script: flowState = "active"</actioncontainer>
-    <actioncontainer id="t109" x="-1855.0" y="-2327.5">Script: flow_informations = "\"userFlowState\":" + " \"" + {flowState} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <conditioncontainer id="t110" x="-1855.0" y="-1557.5">Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t111" x="-2485.0" y="-1802.5">Flow Aktiv: Send Data to AMADCommBridge</conditioncontainer>
-    <actioncontainer id="t112" x="-2450.0" y="-2292.5">Setze Flow Status: Aktivieren Send Data to AMADCommBridge</actioncontainer>
-    <conditioncontainer id="t113" x="-2485.0" y="-1557.5">Expression: trigger == "Periodischer Timer: alle 120s"</conditioncontainer>
-    <actioncontainer id="t114" x="3535.0" y="-3832.5">Script: incomingCaller = "\"incomingCallerName\":" + " \"" + {contact_name} + "\"" + "," + "\"incomingCallerNumber\":" + " \"" + {incoming_number} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t115" x="3885.0" y="-3832.5">Script: incommingWhatsAppMessage = "\"incommingWhatsAppMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t116" x="2310.0" y="-3832.5">Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t117" x="-1050.0" y="-3342.5">Pause: 2s (Gerät wach halten)</actioncontainer>
-    <actioncontainer id="t118" x="-1050.0" y="-3517.5">Script: airpcount = airpcount + 1</actioncontainer>
-    <conditioncontainer id="t119" x="-1050.0" y="-3657.5">Expression: airpcount &lt; 11</conditioncontainer>
-    <actioncontainer id="t120" x="2450.0" y="-3482.5">Script: notification_text = "not supported from your device"</actioncontainer>
-    <actioncontainer id="t121" x="-770.0" y="-3832.5">Script: currentMusic = "\"currentMusicTrack\":" + " \"" + {title} + "\"" + "," + "\"currentMusicAlbum\":" + " \"" + {description} + "\"" + "," + "\"currentMusicArtist\":" + " \"" + {subtitle} + "\"" + "," + "\"currentMusicApp\":" + " \"" + {musicapp} + "\"" + "," + "\"currentMusicIcon\":" + " \"" + {icon} + "\"" + "," + "\"currentMusicState\":" + " \"" + {playback_state} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t122" x="210.0" y="-3832.5">Script: volumevalue = "\"volume\":" + " \"" + {volume} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t123" x="525.0" y="-3832.5">Script: nextAlarm = "\"nextAlarmTime\":" + " \"" + {next_alarmtime} + "\"" + "," + "\"nextAlarmDay\":" + " \"" + {next_alarmday} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <conditioncontainer id="t124" x="0.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker"</conditioncontainer>
-    <conditioncontainer id="t125" x="3255.0" y="-1802.5">Expression: package_name == {global_activetask}</conditioncontainer>
-    <conditioncontainer id="t126" x="4270.0" y="-1592.5">Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <conditioncontainer id="t127" x="1015.0" y="-227.5">Expression: trigger == "App Task Beendet" or trigger == "App Task Gestartet"</conditioncontainer>
-    <conditioncontainer id="t128" x="3255.0" y="-1592.5">Expression: trigger == "App Task Gestartet" or trigger == "Periodischer Timer: alle 120s"</conditioncontainer>
-    <conditioncontainer id="t129" x="-2450.0" y="-2782.5">Expression: trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <actioncontainer id="t130" x="-2450.0" y="-3552.5">Script: if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT") { nextalarmstate = "alert" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS") { nextalarmstate = "dismiss" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE") { nextalarmstate = "done" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE") { nextalarmstate = "snooze" }</actioncontainer>
-    <conditioncontainer id="t131" x="525.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <actioncontainer id="t132" x="525.0" y="-3097.5">Initialisiere Variable Nächster Alarm: next_alarm</actioncontainer>
-    <actioncontainer id="t133" x="630.0" y="-3587.5">Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}"</actioncontainer>
-    <actioncontainer id="t134" x="420.0" y="-3587.5">Script: next_alarmday = "{next_alarm,dateformat,c}"</actioncontainer>
-    <actioncontainer id="t135" x="5040.0" y="-3832.5">Script: volumeRingSound = "\"volumeRingSound\":" + " \"" + {volumeRingSound} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t136" x="5320.0" y="-3832.5">Script: wiredHeadsetPlugged = "\"wiredHeadsetPlugged\":" + " \"" + {headsetValue} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <conditioncontainer id="t137" x="5320.0" y="-2782.5">Expression: trigger == "Kabelgebundenes Headset Verbunden" or trigger == "Kabelgebundenes Headset Getrennt"</conditioncontainer>
-    <conditioncontainer id="t138" x="5040.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System volume_ring"</conditioncontainer>
-    <conditioncontainer id="t139" x="4795.0" y="-2782.5">Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE"</conditioncontainer>
-    <conditioncontainer id="t140" x="5320.0" y="-3132.5">Kabelgebundenes Headset verbunden</conditioncontainer>
-    <actioncontainer id="t141" x="5250.0" y="-3482.5">Script: headsetValue = 1</actioncontainer>
-    <actioncontainer id="t142" x="5390.0" y="-3482.5">Script: headsetValue = 0</actioncontainer>
-    <actioncontainer id="t143" x="-665.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeRingSound</actioncontainer>
-    <actioncontainer id="t144" x="-770.0" y="-3517.5">Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active"</actioncontainer>
-    <actioncontainer id="t145" x="4410.0" y="-3832.5">Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t146" x="4270.0" y="-3482.5">Script: notification_text = "Aktiviere Automagic unter Einstellungen -&gt; Benachrichtigungen -&gt; Benachrichtigungszugriff"</actioncontainer>
-    <conditioncontainer id="t147" x="4410.0" y="-3482.5">Benachrichtigung in Statusbar angezeigt: Telegram Messenger</conditioncontainer>
-    <actioncontainer id="t148" x="4550.0" y="-3482.5">Script: notification_text = "not supported from your device"</actioncontainer>
-    <conditioncontainer id="t149" x="4410.0" y="-3132.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
-    <conditioncontainer id="t150" x="4410.0" y="-2782.5">Expression: trigger == "Benachrichtigung in Statusbar angezeigt: org.telegram.messenger"</conditioncontainer>
-    <conditioncontainer id="t151" x="1015.0" y="-1242.5">Host erreichbar: {global_fhemip}:{global_bridgeport}</conditioncontainer>
-    <conditioncontainer id="t152" x="-3430.0" y="-2782.5">Expression: trigger == "SMS Empfangen: Alle"</conditioncontainer>
-    <actioncontainer id="t153" x="-3430.0" y="-3867.5">Script: incommingSmsText = "\"incommingSmsText\":" + " \"" + replaceAll({sms_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t154" x="-2450.0" y="-3867.5">Script: nextAlarmState = "\"nextAlarmState\":" + " \"" + {nextalarmstate} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t155" x="-2975.0" y="-3867.5">Script: doNotDisturb = "\"doNotDisturb\":" + " \"" + {dndValue} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t156" x="-2170.0" y="-3832.5">Script: screen_state = "on"</actioncontainer>
-    <actioncontainer id="t157" x="-1680.0" y="-3517.5">Script: keyguard = "locked"</actioncontainer>
-    <actioncontainer id="t158" x="-1540.0" y="-3517.5">Script: keyguard = "unlocked"</actioncontainer>
-    <actioncontainer id="t159" x="-1610.0" y="-3097.5">Script: scrcount = 0</actioncontainer>
-    <actioncontainer id="t160" x="-1855.0" y="-4007.5">Script: screen = "\"screen\":" + " \"" + {screen_state} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t161" x="3150.0" y="-3482.5">Script: keyguardset = "1"</actioncontainer>
-    <actioncontainer id="t162" x="3290.0" y="-3482.5">Script: keyguardset = "0"</actioncontainer>
-    <conditioncontainer id="t163" x="3220.0" y="-2782.5">Expression: udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
-    <actioncontainer id="t164" x="3290.0" y="-3132.5">Script: keyguardset = "not supported from your device"</actioncontainer>
-    <actioncontainer id="t165" x="3220.0" y="-3832.5">Script: keyguardSet = "\"keyguardSet\":" + " \"" + {keyguardset} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t166" x="1330.0" y="1417.5">Script: androidVersion = "\"androidVersion\":" + " \"" + {androidVersion} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t167" x="1295.0" y="997.5">Get Android Version</actioncontainer>
-    <actioncontainer id="t168" x="840.0" y="-3832.5">Script: powerinfo = "\"powerLevel\":" + " \"" + "{battery_percentage,numberformat,0}" + "\"" + "," + "\"powerPlugged\":" + " \"" + {battery_plugged} + "\"" + "," + "\"batteryTemperature\":" + " \"" + "{battery_temperature/10.0,numberformat.0.0}" + "\"" + "," + "\"batteryHealth\":" + " \"" + {battery_health} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t169" x="1155.0" y="-3832.5">Script: daydream = "\"daydream\":" + " \"" + {daydream_state} + "\""; fhemcmd = "setreading";</actioncontainer>
-    <actioncontainer id="t170" x="1015.0" y="1417.5">Prüfe und setze globale Variable</actioncontainer>
-    <conditioncontainer id="t171" x="1015.0" y="682.5">Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" and header_amadid == {global_amadid}</conditioncontainer>
-    <actioncontainer id="t172" x="-770.0" y="-3657.5">Script: if(playback_state == 0) { playback_state = "none" } else if(playback_state == 1) { playback_state = "stopped" } else if(playback_state == 2) { playback_state = "pause" } else if(playback_state == 3) { playback_state = "play" } else if(playback_state == 4) { playback_state = "fast forward" } else if(playback_state == 5) { playback_state = "fast backward" } else if(playback_state == 6) { playback_state = "buffert" } else if(playback_state == 7) { playback_state = "error" } else if(playback_state == 8) { playback_state = "connect" } else if(playback_state == 9) { playback_state = "skip forward" } else if(playback_state == 10) { playback_state = "skip backward" } else if(playback_state == 11) { playback_state = "jump to position in playlist" }</actioncontainer>
-    <actioncontainer id="t173" x="-770.0" y="-2992.5">Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } else if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } else if(package_name == "com.google.android.videos") { musicapp = "Google Video" } else if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } else if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } else if(package_name == "com.google.android.apps.youtube.kids") { musicapp = "YouTube Kids" } else if(package_name == "tunein.player") { musicapp = "TuneIn Player" } else if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } else if(package_name == "org.videolan.vlc") { musicapp = "VLC Player" } else if(package_name == "com.sec.android.app.music") { musicapp = "Samsung Music Player" } else if(package_name == "deezer.android.app") { musicapp = "Deezer" }</actioncontainer>
-    <triggercontainer id="t174" x="1015.0" y="-927.5">
+    <triggercontainer id="t1" x="1015.0" y="-927.5">
       <trigger>Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE</trigger>
       <trigger>Kabelgebundenes Headset Verbunden</trigger>
       <trigger>Genereller Broadcast: wenn org.smblott.intentradio.STATE</trigger>
@@ -4399,260 +4226,433 @@ Soll der Assistent gelöscht werden?</actioncontainer>
       <trigger>SMS Empfangen: Alle</trigger>
       <trigger>Medien Session verändert</trigger>
     </triggercontainer>
-    <connection from="t1" to="t169" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <actioncontainer id="t2" x="1085.0" y="-3482.5">Script: daydream_state = "on"</actioncontainer>
+    <actioncontainer id="t3" x="1225.0" y="-3482.5">Script: daydream_state = "off"</actioncontainer>
+    <conditioncontainer id="t4" x="1855.0" y="-3027.5">Display Orientierung: Portrait</conditioncontainer>
+    <actioncontainer id="t5" x="1785.0" y="-3272.5">Script: screen_orientation = "portrait"</actioncontainer>
+    <actioncontainer id="t6" x="1925.0" y="-3272.5">Script: screen_orientation = "landscape"</actioncontainer>
+    <actioncontainer id="t7" x="2730.0" y="-3482.5">Script: dock_state = "docked"</actioncontainer>
+    <actioncontainer id="t8" x="2870.0" y="-3482.5">Script: dock_state = "undocked"</actioncontainer>
+    <actioncontainer id="t9" x="1925.0" y="-3657.5">Script: screen_orientation_mode = "manual"</actioncontainer>
+    <conditioncontainer id="t10" x="-1855.0" y="-3832.5">Expression: scrcount &lt; 5</conditioncontainer>
+    <actioncontainer id="t11" x="-1855.0" y="-3657.5">Script: scrcount = scrcount + 1</actioncontainer>
+    <actioncontainer id="t12" x="-1855.0" y="-3517.5">Pause: 2s (Gerät wach halten)</actioncontainer>
+    <conditioncontainer id="t13" x="2800.0" y="-3132.5">Dock Status: Docked</conditioncontainer>
+    <conditioncontainer id="t14" x="1855.0" y="-3482.5">Display automatisch drehen eingeschaltet</conditioncontainer>
+    <conditioncontainer id="t15" x="1155.0" y="-3132.5">Expression: trigger == "Daydream Status: Gestartet"</conditioncontainer>
+    <conditioncontainer id="t16" x="-455.0" y="-3097.5">Bluetooth eingeschaltet</conditioncontainer>
+    <conditioncontainer id="t17" x="-1610.0" y="-3342.5">Keyguard gesperrt</conditioncontainer>
+    <conditioncontainer id="t18" x="-1855.0" y="-3342.5">Expression: keyguard == "locked"</conditioncontainer>
+    <conditioncontainer id="t19" x="3150.0" y="-3132.5">Expression: getAndroidSDKVersion() &gt;= "16"</conditioncontainer>
+    <conditioncontainer id="t20" x="-1610.0" y="-3657.5">Display eingeschaltet</conditioncontainer>
+    <conditioncontainer id="t21" x="-2100.0" y="-3657.5">Display eingeschaltet</conditioncontainer>
+    <conditioncontainer id="t22" x="-2100.0" y="-3097.5">Expression: getAndroidSDKVersion() &gt;= "16"</conditioncontainer>
+    <conditioncontainer id="t23" x="-2730.0" y="-3342.5">Unterbrechnungen-Modus: Nur Wecker (Android 6+)</conditioncontainer>
+    <conditioncontainer id="t24" x="-2870.0" y="-3342.5">Unterbrechnungen-Modus: Keine / Nicht unterbrechen</conditioncontainer>
+    <conditioncontainer id="t25" x="-3010.0" y="-3342.5">Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen</conditioncontainer>
+    <conditioncontainer id="t26" x="-3150.0" y="-3342.5">Unterbrechnungen-Modus: Alle / Immer unterbrechen</conditioncontainer>
+    <actioncontainer id="t27" x="-3150.0" y="-3552.5">Script: dndValue = "always"</actioncontainer>
+    <actioncontainer id="t28" x="-3010.0" y="-3552.5">Script: dndValue = "onlyImportant"</actioncontainer>
+    <actioncontainer id="t29" x="-2870.0" y="-3552.5">Script: dndValue = "never"</actioncontainer>
+    <actioncontainer id="t30" x="-2730.0" y="-3552.5">Script: dndValue = "alarmClockOnly"</actioncontainer>
+    <actioncontainer id="t31" x="-2030.0" y="-3832.5">Script: screen_state = "off"</actioncontainer>
+    <actioncontainer id="t32" x="-1680.0" y="-3832.5">Script: screen_state = "on {keyguard}"</actioncontainer>
+    <actioncontainer id="t33" x="-1540.0" y="-3832.5">Script: screen_state = "off {keyguard}"</actioncontainer>
+    <actioncontainer id="t34" x="-1225.0" y="-3657.5">Script: airplanemode = "off"</actioncontainer>
+    <actioncontainer id="t35" x="-455.0" y="-3342.5">Script: bluetooth_state = "on"</actioncontainer>
+    <actioncontainer id="t36" x="1260.0" y="1207.5">Script: androidVersion = "not supported funktion"</actioncontainer>
+    <conditioncontainer id="t37" x="3395.0" y="-2047.5">App Task läuft: {global_activetask} (neuster)</conditioncontainer>
+    <actioncontainer id="t38" x="3465.0" y="-2257.5">Script: runTask = "1"</actioncontainer>
+    <actioncontainer id="t39" x="3325.0" y="-2257.5">Script: runTask = "0"</actioncontainer>
+    <conditioncontainer id="t40" x="3115.0" y="-2047.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
+    <actioncontainer id="t41" x="3115.0" y="-2257.5">Script: runTask = "not supported android version"</actioncontainer>
+    <actioncontainer id="t42" x="2905.0" y="-2292.5">Script: runTask = "null"</actioncontainer>
+    <conditioncontainer id="t43" x="3185.0" y="-1872.5">Expression: global_activetask != null</conditioncontainer>
+    <conditioncontainer id="t44" x="-1855.0" y="-2782.5">Expression: trigger == "Display Status: Aus" or trigger == "Display Status: Ein" or udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t45" x="1155.0" y="-2782.5">Expression: trigger == "Daydream Status: Gestartet" or trigger == "Daydream Status: Gestoppt"</conditioncontainer>
+    <conditioncontainer id="t46" x="1855.0" y="-2782.5">Expression: trigger == "Display Orientierung: Landscape" or trigger == "Display Orientierung: Portrait" or trigger == "Display Status: Ein" or trigger == "Display Status: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t47" x="840.0" y="-2782.5">Expression: trigger == "Akku Ladestand: grösser als 0%"</conditioncontainer>
+    <conditioncontainer id="t48" x="-245.0" y="997.5">Stromversorgung: Angeschlossen</conditioncontainer>
+    <actioncontainer id="t49" x="1785.0" y="-3657.5">Script: screen_orientation_mode = "auto"</actioncontainer>
+    <actioncontainer id="t50" x="-455.0" y="-3552.5">Script: bluetooth_state = "off"</actioncontainer>
+    <conditioncontainer id="t51" x="3220.0" y="-3307.5">Keyguard mit Sicherheit</conditioncontainer>
+    <conditioncontainer id="t52" x="3535.0" y="-2782.5">Expression: trigger == "Eingehender Anruf. Status: Klingelt, Nummern: Alle"</conditioncontainer>
+    <conditioncontainer id="t53" x="-1120.0" y="-2782.5">Expression: trigger == "Flugmodus: Aus" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t54" x="1505.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System screen_brightness"</conditioncontainer>
+    <conditioncontainer id="t55" x="105.0" y="1102.5">Bluetooth Gerät verbunden: Beliebiges Geräte (Advanced Audio Distribution)</conditioncontainer>
+    <actioncontainer id="t56" x="35.0" y="1207.5">Script: volume = {volumeBT}</actioncontainer>
+    <actioncontainer id="t57" x="-770.0" y="-3342.5">Pause: 2s (Gerät wach halten)</actioncontainer>
+    <conditioncontainer id="t58" x="-770.0" y="-3167.5">Musik Aktiv</conditioncontainer>
+    <actioncontainer id="t59" x="735.0" y="1417.5">Benachrichtigung auf Bildschirm: [AMAD2] Nicht mehr benötigte AMAD Flows wurden entfernt! (lange)</actioncontainer>
+    <conditioncontainer id="t60" x="210.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System volume_music_bt_a2dp" or trigger == "Systemeinstellung verändert: System volume_music_speaker" or trigger == "Systemeinstellung verändert: System volume_music_headphone" or trigger == "Systemeinstellung verändert: System volume_music_headset"</conditioncontainer>
+    <actioncontainer id="t61" x="35.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeMusikBluetooth.2</actioncontainer>
+    <actioncontainer id="t62" x="175.0" y="1207.5">Script: volume = {volumeSP}</actioncontainer>
+    <actioncontainer id="t63" x="175.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeMusikSpeaker.2</actioncontainer>
+    <conditioncontainer id="t64" x="-2940.0" y="-2782.5">Expression: trigger == "Unterbrechnungen-Modus: Alle / Immer unterbrechen" or trigger == "Unterbrechnungen-Modus: Keine / Nicht unterbrechen" or trigger == "Unterbrechnungen-Modus: Nur Wecker (Android 6+)" or trigger == "Unterbrechnungen-Modus: Wichtig / Nur wichtige Unterbrechnungen zulassen" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t65" x="-2940.0" y="-3097.5">Expression: getAndroidSDKVersion() &gt;= "21"</conditioncontainer>
+    <actioncontainer id="t66" x="-1120.0" y="-3097.5">Script: airpcount = 0</actioncontainer>
+    <conditioncontainer id="t67" x="-1225.0" y="-3342.5">Host erreichbar: {global_fhemip}:{global_bridgeport}</conditioncontainer>
+    <actioncontainer id="t68" x="3885.0" y="-997.5">WLAN Reassoziieren</actioncontainer>
+    <conditioncontainer id="t69" x="1015.0" y="157.5">Expression: global_fhemip != null or global_bridgeport != null</conditioncontainer>
+    <conditioncontainer id="t70" x="3885.0" y="-3132.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
+    <actioncontainer id="t71" x="3745.0" y="-3482.5">Script: notification_text = "Aktiviere Automagic unter Einstellungen -&gt; Benachrichtigungen -&gt; Benachrichtigungszugriff"</actioncontainer>
+    <actioncontainer id="t72" x="4025.0" y="-3482.5">Script: notification_text = "not supported from your device"</actioncontainer>
+    <conditioncontainer id="t73" x="3885.0" y="-2782.5">Expression: trigger == "Benachrichtigung in Statusbar angezeigt: com.whatsapp"</conditioncontainer>
+    <conditioncontainer id="t74" x="3885.0" y="-3482.5">Benachrichtigung in Statusbar angezeigt: WhatsApp</conditioncontainer>
+    <actioncontainer id="t75" x="-875.0" y="997.5">Initialisiere Variable Systemeinstellung: screenBrightness</actioncontainer>
+    <actioncontainer id="t76" x="-455.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeNotification</actioncontainer>
+    <conditioncontainer id="t77" x="-770.0" y="-2782.5">Expression: trigger == "Medien Session verändert" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t78" x="3885.0" y="-1592.5">WLAN verfügbar: {global_apssid}</conditioncontainer>
+    <actioncontainer id="t79" x="4795.0" y="-3832.5">Script: intentRadioState = "\"intentRadioState\":" + " \"" + {irstate} + "\"" + "," + "\"intentRadioName\":" + " \"" + {irname} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t80" x="2800.0" y="-3832.5">Script: dockingState = "\"dockingState\":" + " \"" + {dock_state} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t81" x="1855.0" y="-3832.5">Script: screenOrientation = "\"screenOrientation\":" + " \"" + {screen_orientation} + "\"" + "," + "\"screenOrientationMode\":" + " \"" + {screen_orientation_mode} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t82" x="1505.0" y="-3832.5">Script: screenBrightness = "\"screenBrightness\":" + " \"" + {screenBrightness} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t83" x="0.0" y="-3832.5">Script: volumeNotification = "\"volumeNotification\":" + " \"" + {volumeNotification} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t84" x="-1120.0" y="-3832.5">Script: airplanemode = "\"airplanemode\":" + " \"" + {airplanemode} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t85" x="3220.0" y="-2467.5">Script: checkActiveTask = "\"checkActiveTask\":" + " \"" + {runTask} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <conditioncontainer id="t86" x="595.0" y="1417.5">Expression: Leon == "Gaultier"</conditioncontainer>
+    <actioncontainer id="t87" x="665.0" y="1207.5">Flows löschen: MultimediaControl</actioncontainer>
+    <conditioncontainer id="t88" x="2310.0" y="-2782.5">Expression: trigger == "Benachrichtigung in Statusbar angezeigt: ch.gridvision.ppam.androidautomagic" or trigger == "Benachrichtigung in Statusbar entfernt: ch.gridvision.ppam.androidautomagic" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t89" x="2310.0" y="-3027.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
+    <actioncontainer id="t90" x="2170.0" y="-3482.5">Script: notification_text = "Aktiviere Automagic unter Einstellungen -&gt; Benachrichtigungen -&gt; Benachrichtigungszugriff"</actioncontainer>
+    <conditioncontainer id="t91" x="2310.0" y="-3482.5">Benachrichtigung in Statusbar angezeigt: Automagic</conditioncontainer>
+    <actioncontainer id="t92" x="4270.0" y="-892.5">Script: deviceState = "\"deviceState\": \"online\""; fhemcmd = "setreading";</actioncontainer>
+    <conditioncontainer id="t93" x="2800.0" y="-2782.5">Expression: trigger == "Dock Event: Docked" or trigger == "Dock Event: Undocked" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <actioncontainer id="t94" x="1015.0" y="-4602.5">Flows ausführen: Send Data to AMADCommBridge</actioncontainer>
+    <actioncontainer id="t95" x="-455.0" y="-3832.5">Script: bluetooth = "\"bluetooth\":" + " \"" + {bluetooth_state} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t96" x="-315.0" y="-3552.5">Script: connected_devices_names = "none"; connected_devices_addresses = "none"</actioncontainer>
+    <actioncontainer id="t97" x="-315.0" y="-3832.5">Script: btdeviceinfo = "\"connectedBTdevices\":" + " \"" + {connected_devices_names} + "\"" + "," + "\"connectedBTdevicesMAC\":" + " \"" + {connected_devices_addresses} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <conditioncontainer id="t98" x="-315.0" y="-3097.5">Bluetooth Gerät verbunden: Beliebiges Geräte</conditioncontainer>
+    <conditioncontainer id="t99" x="-420.0" y="-2782.5">Expression: trigger == "Bluetooth Status: Schaltet aus, Aus" or trigger == "Bluetooth Gerät verbunden: Alle Geräte" or trigger == "Bluetooth Gerät getrennt: Alle Geräte" or trigger == "Bluetooth Status: Schaltet ein, Ein" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <actioncontainer id="t100" x="-1120.0" y="-2327.5">Script: flow_SetCommands = "\"flow_SetCommands\":" + " \"" + {setCommandFlow_state} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t101" x="-1120.0" y="-2152.5">Setze Flow Status: Aktivieren SetCommands</actioncontainer>
+    <actioncontainer id="t102" x="-1015.0" y="-1977.5">Script: setCommandFlow_state = "aktiv"</actioncontainer>
+    <actioncontainer id="t103" x="-1225.0" y="-1977.5">Script: setCommandFlow_state = "inaktiv"</actioncontainer>
+    <conditioncontainer id="t104" x="-1120.0" y="-1802.5">Flow Aktiv: SetCommands</conditioncontainer>
+    <conditioncontainer id="t105" x="-1120.0" y="-1557.5">Expression: trigger == "Periodischer Timer: alle 120s"</conditioncontainer>
+    <conditioncontainer id="t106" x="-1855.0" y="-1802.5">Expression: global_userflowstate != "none"</conditioncontainer>
+    <conditioncontainer id="t107" x="-1855.0" y="-1977.5">Flow Aktiv: {global_userflowstate}</conditioncontainer>
+    <actioncontainer id="t108" x="-1925.0" y="-2152.5">Script: flowState = "inactive"</actioncontainer>
+    <actioncontainer id="t109" x="-1785.0" y="-2152.5">Script: flowState = "active"</actioncontainer>
+    <actioncontainer id="t110" x="-1855.0" y="-2327.5">Script: flow_informations = "\"userFlowState\":" + " \"" + {flowState} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <conditioncontainer id="t111" x="-1855.0" y="-1557.5">Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t112" x="-2485.0" y="-1802.5">Flow Aktiv: Send Data to AMADCommBridge</conditioncontainer>
+    <actioncontainer id="t113" x="-2450.0" y="-2292.5">Setze Flow Status: Aktivieren Send Data to AMADCommBridge</actioncontainer>
+    <conditioncontainer id="t114" x="-2485.0" y="-1557.5">Expression: trigger == "Periodischer Timer: alle 120s"</conditioncontainer>
+    <actioncontainer id="t115" x="3535.0" y="-3832.5">Script: incomingCaller = "\"incomingCallerName\":" + " \"" + {contact_name} + "\"" + "," + "\"incomingCallerNumber\":" + " \"" + {incoming_number} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t116" x="3885.0" y="-3832.5">Script: incommingWhatsAppMessage = "\"incommingWhatsAppMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t117" x="2310.0" y="-3832.5">Script: automagicState = "\"automagicState\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t118" x="-1050.0" y="-3342.5">Pause: 2s (Gerät wach halten)</actioncontainer>
+    <actioncontainer id="t119" x="-1050.0" y="-3517.5">Script: airpcount = airpcount + 1</actioncontainer>
+    <conditioncontainer id="t120" x="-1050.0" y="-3657.5">Expression: airpcount &lt; 11</conditioncontainer>
+    <actioncontainer id="t121" x="2450.0" y="-3482.5">Script: notification_text = "not supported from your device"</actioncontainer>
+    <actioncontainer id="t122" x="-770.0" y="-3832.5">Script: currentMusic = "\"currentMusicTrack\":" + " \"" + {title} + "\"" + "," + "\"currentMusicAlbum\":" + " \"" + {description} + "\"" + "," + "\"currentMusicArtist\":" + " \"" + {subtitle} + "\"" + "," + "\"currentMusicApp\":" + " \"" + {musicapp} + "\"" + "," + "\"currentMusicIcon\":" + " \"" + {icon} + "\"" + "," + "\"currentMusicState\":" + " \"" + {playback_state} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t123" x="210.0" y="-3832.5">Script: volumevalue = "\"volume\":" + " \"" + {volume} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t124" x="525.0" y="-3832.5">Script: nextAlarm = "\"nextAlarmTime\":" + " \"" + {next_alarmtime} + "\"" + "," + "\"nextAlarmDay\":" + " \"" + {next_alarmday} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <conditioncontainer id="t125" x="0.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System volume_ring_speaker"</conditioncontainer>
+    <conditioncontainer id="t126" x="3255.0" y="-1802.5">Expression: package_name == {global_activetask}</conditioncontainer>
+    <conditioncontainer id="t127" x="4270.0" y="-1592.5">Expression: trigger == "Periodischer Timer: alle 120s" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <conditioncontainer id="t128" x="1015.0" y="-227.5">Expression: trigger == "App Task Beendet" or trigger == "App Task Gestartet"</conditioncontainer>
+    <conditioncontainer id="t129" x="3255.0" y="-1592.5">Expression: trigger == "App Task Gestartet" or trigger == "Periodischer Timer: alle 120s"</conditioncontainer>
+    <conditioncontainer id="t130" x="-2450.0" y="-2782.5">Expression: trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE" or trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <actioncontainer id="t131" x="-2450.0" y="-3552.5">Script: if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_ALERT") { nextalarmstate = "alert" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DISMISS") { nextalarmstate = "dismiss" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_DONE") { nextalarmstate = "done" } if(trigger == "Genereller Broadcast: wenn com.android.deskclock.ALARM_SNOOZE") { nextalarmstate = "snooze" }</actioncontainer>
+    <conditioncontainer id="t132" x="525.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System next_alarm" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <actioncontainer id="t133" x="525.0" y="-3097.5">Initialisiere Variable Nächster Alarm: next_alarm</actioncontainer>
+    <actioncontainer id="t134" x="630.0" y="-3587.5">Script: next_alarmtime = "{next_alarm,dateformat,HH:mm}"</actioncontainer>
+    <actioncontainer id="t135" x="420.0" y="-3587.5">Script: next_alarmday = "{next_alarm,dateformat,c}"</actioncontainer>
+    <actioncontainer id="t136" x="5040.0" y="-3832.5">Script: volumeRingSound = "\"volumeRingSound\":" + " \"" + {volumeRingSound} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t137" x="5320.0" y="-3832.5">Script: wiredHeadsetPlugged = "\"wiredHeadsetPlugged\":" + " \"" + {headsetValue} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <conditioncontainer id="t138" x="5320.0" y="-2782.5">Expression: trigger == "Kabelgebundenes Headset Verbunden" or trigger == "Kabelgebundenes Headset Getrennt"</conditioncontainer>
+    <conditioncontainer id="t139" x="5040.0" y="-2782.5">Expression: trigger == "Systemeinstellung verändert: System volume_ring"</conditioncontainer>
+    <conditioncontainer id="t140" x="4795.0" y="-2782.5">Expression: trigger == "Genereller Broadcast: wenn org.smblott.intentradio.STATE"</conditioncontainer>
+    <conditioncontainer id="t141" x="5320.0" y="-3132.5">Kabelgebundenes Headset verbunden</conditioncontainer>
+    <actioncontainer id="t142" x="5250.0" y="-3482.5">Script: headsetValue = 1</actioncontainer>
+    <actioncontainer id="t143" x="5390.0" y="-3482.5">Script: headsetValue = 0</actioncontainer>
+    <actioncontainer id="t144" x="-665.0" y="997.5">Initialisiere Variable Systemeinstellung: volumeRingSound</actioncontainer>
+    <actioncontainer id="t145" x="-770.0" y="-3517.5">Script: subtitle = "no player active"; title = "no player active"; description = "no player active"; musicapp = "no player active"; icon = "no player active"</actioncontainer>
+    <actioncontainer id="t146" x="4410.0" y="-3832.5">Script: incommingTelegramMessage = "\"incommingTelegramMessageFrom\":" + " \"" + replaceAll({notification_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t147" x="4270.0" y="-3482.5">Script: notification_text = "Aktiviere Automagic unter Einstellungen -&gt; Benachrichtigungen -&gt; Benachrichtigungszugriff"</actioncontainer>
+    <conditioncontainer id="t148" x="4410.0" y="-3482.5">Benachrichtigung in Statusbar angezeigt: Telegram Messenger</conditioncontainer>
+    <actioncontainer id="t149" x="4550.0" y="-3482.5">Script: notification_text = "not supported from your device"</actioncontainer>
+    <conditioncontainer id="t150" x="4410.0" y="-3132.5">Expression: getAndroidSDKVersion() &gt;= "19"</conditioncontainer>
+    <conditioncontainer id="t151" x="4410.0" y="-2782.5">Expression: trigger == "Benachrichtigung in Statusbar angezeigt: org.telegram.messenger"</conditioncontainer>
+    <conditioncontainer id="t152" x="1015.0" y="-1242.5">Host erreichbar: {global_fhemip}:{global_bridgeport}</conditioncontainer>
+    <conditioncontainer id="t153" x="-3430.0" y="-2782.5">Expression: trigger == "SMS Empfangen: Alle"</conditioncontainer>
+    <actioncontainer id="t154" x="-2450.0" y="-3867.5">Script: nextAlarmState = "\"nextAlarmState\":" + " \"" + {nextalarmstate} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t155" x="-2975.0" y="-3867.5">Script: doNotDisturb = "\"doNotDisturb\":" + " \"" + {dndValue} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t156" x="-2170.0" y="-3832.5">Script: screen_state = "on"</actioncontainer>
+    <actioncontainer id="t157" x="-1680.0" y="-3517.5">Script: keyguard = "locked"</actioncontainer>
+    <actioncontainer id="t158" x="-1540.0" y="-3517.5">Script: keyguard = "unlocked"</actioncontainer>
+    <actioncontainer id="t159" x="-1610.0" y="-3097.5">Script: scrcount = 0</actioncontainer>
+    <actioncontainer id="t160" x="-1855.0" y="-4007.5">Script: screen = "\"screen\":" + " \"" + {screen_state} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t161" x="3150.0" y="-3482.5">Script: keyguardset = "1"</actioncontainer>
+    <actioncontainer id="t162" x="3290.0" y="-3482.5">Script: keyguardset = "0"</actioncontainer>
+    <conditioncontainer id="t163" x="3220.0" y="-2782.5">Expression: udef_trigger == "setLockPin" or trigger == "HTTP Request: /fhem-amad/deviceInfo/"</conditioncontainer>
+    <actioncontainer id="t164" x="3290.0" y="-3132.5">Script: keyguardset = "not supported from your device"</actioncontainer>
+    <actioncontainer id="t165" x="3220.0" y="-3832.5">Script: keyguardSet = "\"keyguardSet\":" + " \"" + {keyguardset} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t166" x="1330.0" y="1417.5">Script: androidVersion = "\"androidVersion\":" + " \"" + {androidVersion} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t167" x="1295.0" y="997.5">Get Android Version</actioncontainer>
+    <actioncontainer id="t168" x="840.0" y="-3832.5">Script: powerinfo = "\"powerLevel\":" + " \"" + "{battery_percentage,numberformat,0}" + "\"" + "," + "\"powerPlugged\":" + " \"" + {battery_plugged} + "\"" + "," + "\"batteryTemperature\":" + " \"" + "{battery_temperature/10.0,numberformat.0.0}" + "\"" + "," + "\"batteryHealth\":" + " \"" + {battery_health} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t169" x="1155.0" y="-3832.5">Script: daydream = "\"daydream\":" + " \"" + {daydream_state} + "\""; fhemcmd = "setreading";</actioncontainer>
+    <actioncontainer id="t170" x="1015.0" y="1417.5">Prüfe und setze globale Variable</actioncontainer>
+    <conditioncontainer id="t171" x="1015.0" y="682.5">Expression: trigger == "HTTP Request: /fhem-amad/deviceInfo/" and header_amadid == {global_amadid}</conditioncontainer>
+    <actioncontainer id="t172" x="-770.0" y="-3657.5">Script: if(playback_state == 0) { playback_state = "none" } else if(playback_state == 1) { playback_state = "stopped" } else if(playback_state == 2) { playback_state = "pause" } else if(playback_state == 3) { playback_state = "play" } else if(playback_state == 4) { playback_state = "fast forward" } else if(playback_state == 5) { playback_state = "fast backward" } else if(playback_state == 6) { playback_state = "buffert" } else if(playback_state == 7) { playback_state = "error" } else if(playback_state == 8) { playback_state = "connect" } else if(playback_state == 9) { playback_state = "skip forward" } else if(playback_state == 10) { playback_state = "skip backward" } else if(playback_state == 11) { playback_state = "jump to position in playlist" }</actioncontainer>
+    <actioncontainer id="t173" x="-770.0" y="-2992.5">Script: if(package_name == "com.google.android.music") { musicapp = "Google Musik" } else if(package_name == "com.amazon.mp3") { musicapp = "Amazon Musik" } else if(package_name == "com.google.android.videos") { musicapp = "Google Video" } else if(package_name == "com.spotify.music") { musicapp = "Spotify Musik" } else if(package_name == "com.google.android.youtube") { musicapp = "YouTube" } else if(package_name == "com.google.android.apps.youtube.kids") { musicapp = "YouTube Kids" } else if(package_name == "tunein.player") { musicapp = "TuneIn Player" } else if(package_name == "com.rhapsody.alditalk") { musicapp = "Aldi Life Musik" } else if(package_name == "org.videolan.vlc") { musicapp = "VLC Player" } else if(package_name == "com.sec.android.app.music") { musicapp = "Samsung Music Player" } else if(package_name == "deezer.android.app") { musicapp = "Deezer" }</actioncontainer>
+    <actioncontainer id="t174" x="-3430.0" y="-3867.5">Script: incommingSmsText = "\"incommingSmsText\":" + " \"" + {sms_sender} + " - " + replaceAll({sms_text}, "\\n", " ") + "\""; fhemcmd = "setreading";</actioncontainer>
+    <connection from="t1" to="t128" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t2" to="t169" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t3" to="t4" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t3" to="t5" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t4" to="t13" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t5" to="t13" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t6" to="t79" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t7" to="t79" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t3" to="t169" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t4" to="t5" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t4" to="t6" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t5" to="t14" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t6" to="t14" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t7" to="t80" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t8" to="t80" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t9" to="t10" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t10" to="t11" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t11" to="t17" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t12" to="t6" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t12" to="t7" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t13" to="t48" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t9" to="t81" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t10" to="t11" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t11" to="t12" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t12" to="t18" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t13" to="t7" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t13" to="t8" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t14" to="t1" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t14" to="t2" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t15" to="t34" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t15" to="t49" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t16" to="t158" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t16" to="t157" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t17" to="t16" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t18" to="t50" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t18" to="t164" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t19" to="t31" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t19" to="t32" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t19" to="t9" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t20" to="t156" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t20" to="t30" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t21" to="t159" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t21" to="t20" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t22" to="t29" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t23" to="t28" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t24" to="t27" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t25" to="t26" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t26" to="t155" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t14" to="t49" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t14" to="t9" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t15" to="t2" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t15" to="t3" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t16" to="t35" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t16" to="t50" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t17" to="t158" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t17" to="t157" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t18" to="t17" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t19" to="t51" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t19" to="t164" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t20" to="t32" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t20" to="t33" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t20" to="t10" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t21" to="t156" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t21" to="t31" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t22" to="t159" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t22" to="t21" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t23" to="t30" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t24" to="t29" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t25" to="t28" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t26" to="t27" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t27" to="t155" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t28" to="t155" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t29" to="t155" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t30" to="t160" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t30" to="t155" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t31" to="t160" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t32" to="t160" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t33" to="t83" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t34" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t35" to="t166" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t36" to="t37" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t36" to="t38" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t37" to="t84" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t38" to="t84" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t39" to="t36" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t39" to="t40" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t39" to="t40" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t40" to="t84" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t41" to="t84" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t42" to="t41" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t42" to="t39" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t43" to="t21" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t44" to="t14" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t45" to="t3" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t46" to="t168" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t33" to="t160" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t34" to="t84" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t35" to="t95" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t36" to="t166" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t37" to="t38" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t37" to="t39" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t38" to="t85" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t39" to="t85" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t40" to="t37" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t40" to="t41" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t40" to="t41" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t41" to="t85" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t42" to="t85" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t43" to="t42" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t43" to="t40" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t44" to="t22" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t45" to="t15" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t46" to="t4" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t47" to="t168" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t47" to="t168" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t48" to="t80" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t49" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t50" to="t161" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t50" to="t162" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t51" to="t114" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t52" to="t65" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t53" to="t81" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t54" to="t55" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t54" to="t61" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t55" to="t122" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t56" to="t144" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t57" to="t56" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t57" to="t172" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t59" to="t122" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t60" to="t54" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t61" to="t122" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t62" to="t54" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t63" to="t64" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t64" to="t25" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t64" to="t24" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t64" to="t23" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t64" to="t22" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t65" to="t66" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t66" to="t33" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t66" to="t119" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t68" to="t171" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t68" to="t151" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t68" to="t171" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t69" to="t71" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t69" to="t73" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t70" to="t115" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t71" to="t115" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t72" to="t69" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t73" to="t70" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t73" to="t115" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t74" to="t81" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t48" to="t168" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t48" to="t168" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t49" to="t81" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t50" to="t95" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t51" to="t161" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t51" to="t162" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t52" to="t115" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t53" to="t66" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t54" to="t82" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t55" to="t56" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t55" to="t62" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t56" to="t123" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t57" to="t145" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t58" to="t57" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t58" to="t172" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t60" to="t123" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t61" to="t55" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t62" to="t123" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t63" to="t55" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t64" to="t65" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t65" to="t26" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t65" to="t25" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t65" to="t24" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t65" to="t23" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t66" to="t67" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t67" to="t34" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t67" to="t120" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t69" to="t171" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t69" to="t152" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t69" to="t171" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t70" to="t72" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t70" to="t74" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t71" to="t116" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t72" to="t116" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t73" to="t70" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t74" to="t71" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t74" to="t116" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t75" to="t82" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t76" to="t173" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t77" to="t67" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t78" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t79" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t80" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t81" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t82" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t83" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t84" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t86" to="t58" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t86" to="t85" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t87" to="t88" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t88" to="t90" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t88" to="t120" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t88" to="t120" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t89" to="t116" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t90" to="t89" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t90" to="t116" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t91" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t92" to="t12" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t94" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t95" to="t96" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t96" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t97" to="t96" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t97" to="t95" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t98" to="t15" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t76" to="t83" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t77" to="t173" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t78" to="t68" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t79" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t80" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t81" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t82" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t83" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t84" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t85" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t87" to="t59" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t87" to="t86" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t88" to="t89" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t89" to="t91" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t89" to="t121" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t89" to="t121" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t90" to="t117" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t91" to="t90" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t91" to="t117" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t92" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t93" to="t13" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t95" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t96" to="t97" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t97" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t98" to="t97" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t99" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t101" to="t99" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t98" to="t96" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t99" to="t16" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t99" to="t98" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t100" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t102" to="t100" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t102" to="t99" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t103" to="t101" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t103" to="t102" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t104" to="t103" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t105" to="t106" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t106" to="t107" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t106" to="t108" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t107" to="t109" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t108" to="t109" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t109" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t110" to="t105" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t111" to="t112" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t113" to="t111" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t114" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t115" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t116" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t117" to="t66" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t118" to="t117" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t119" to="t118" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t120" to="t116" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t121" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t122" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t123" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t124" to="t82" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t125" to="t42" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t126" to="t91" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t127" to="t68" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t127" to="t52" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t127" to="t128" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t128" to="t42" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t128" to="t125" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t129" to="t130" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t130" to="t154" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t131" to="t132" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t132" to="t134" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t132" to="t133" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t133" to="t123" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t134" to="t123" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t135" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t136" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t137" to="t140" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t138" to="t135" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t139" to="t78" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t140" to="t141" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t140" to="t142" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t141" to="t136" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t142" to="t136" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t143" to="t135" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t144" to="t172" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t145" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t146" to="t145" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t147" to="t146" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t147" to="t145" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t148" to="t145" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t149" to="t148" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t149" to="t147" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t150" to="t149" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t131" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t59" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t53" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t124" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t43" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t98" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t87" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t46" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t45" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t44" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t92" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t76" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t163" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t51" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t72" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t129" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t139" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t126" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t63" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t77" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t104" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t110" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t110" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t138" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t103" to="t101" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t103" to="t100" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t104" to="t102" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t104" to="t103" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t105" to="t104" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t106" to="t107" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t107" to="t108" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t107" to="t109" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t108" to="t110" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t109" to="t110" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t110" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t111" to="t106" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t112" to="t113" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t114" to="t112" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t115" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t116" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t117" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t118" to="t67" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t119" to="t118" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t120" to="t119" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t121" to="t117" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t122" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t123" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t124" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t125" to="t83" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t126" to="t43" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t127" to="t92" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t128" to="t69" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t128" to="t53" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t128" to="t129" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t129" to="t43" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t129" to="t126" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t130" to="t131" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t131" to="t154" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t132" to="t133" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t133" to="t135" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t133" to="t134" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t134" to="t124" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t135" to="t124" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t136" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t137" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t138" to="t141" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t139" to="t136" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t140" to="t79" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t141" to="t142" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t141" to="t143" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t142" to="t137" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t143" to="t137" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t144" to="t136" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t145" to="t172" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t146" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t147" to="t146" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t148" to="t147" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t148" to="t146" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t149" to="t146" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t150" to="t149" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t150" to="t148" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t151" to="t150" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t104" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t113" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t113" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t128" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t137" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t151" to="t152" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t132" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t60" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t54" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t125" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t44" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t99" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t88" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t47" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t46" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t45" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t93" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t77" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t163" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t52" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t73" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t130" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t140" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t127" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t64" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t78" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t105" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t111" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t111" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t139" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t151" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t105" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t114" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t114" type="FALSE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t129" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t152" to="t138" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t152" to="t153" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t153" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t154" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t155" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t153" to="t174" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t154" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t155" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t156" to="t160" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t157" to="t19" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t158" to="t19" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t159" to="t16" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t160" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t157" to="t20" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t158" to="t20" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t159" to="t17" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t160" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t161" to="t165" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t162" to="t165" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t163" to="t18" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t163" to="t19" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t164" to="t165" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t165" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t166" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t167" to="t35" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t165" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t166" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t167" to="t36" type="EXCEPTION" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t167" to="t166" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t168" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t169" to="t93" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t171" to="t62" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t171" to="t60" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t168" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t169" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t171" to="t63" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t171" to="t61" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t171" to="t76" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t171" to="t48" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t171" to="t75" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t171" to="t47" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t171" to="t74" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t171" to="t167" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t171" to="t86" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t171" to="t87" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
     <connection from="t171" to="t170" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t171" to="t143" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t171" to="t140" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t172" to="t121" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t173" to="t57" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
-    <connection from="t174" to="t127" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t171" to="t144" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t171" to="t141" type="TRUE" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t172" to="t122" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t173" to="t58" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
+    <connection from="t174" to="t94" type="NORMAL" sourcePosition="SOUTH" targetPosition="NORTH" />
   </flow>
   <flow type="flow">
     <name>NFC Tag Support</name>
-    <group>AMADNG Info/Control Flowset v4.1.99.7</group>
+    <group>AMADNG Info/Control Flowset v4.1.99.8</group>
     <enabled>true</enabled>
     <executionPolicy>PARALLEL</executionPolicy>
     <triggercontainer id="t1" x="70.0" y="52.5">
@@ -4666,7 +4666,7 @@ Soll der Assistent gelöscht werden?</actioncontainer>
   </flow>
   <flow type="flow">
     <name>Send Data to AMADCommBridge</name>
-    <group>AMADNG Info/Control Flowset v4.1.99.7</group>
+    <group>AMADNG Info/Control Flowset v4.1.99.8</group>
     <enabled>true</enabled>
     <executionPolicy>PARALLEL</executionPolicy>
     <emergencyStopCount>900</emergencyStopCount>
@@ -4740,7 +4740,7 @@ Soll der Assistent gelöscht werden?</actioncontainer>
   </flow>
   <flow type="flow">
     <name>SetCommands</name>
-    <group>AMADNG Info/Control Flowset v4.1.99.7</group>
+    <group>AMADNG Info/Control Flowset v4.1.99.8</group>
     <enabled>true</enabled>
     <executionPolicy>QUEUE</executionPolicy>
     <emergencyStopCount>900</emergencyStopCount>
@@ -5179,7 +5179,7 @@ Soll der Assistent gelöscht werden?</actioncontainer>
   </flow>
   <flow type="flow">
     <name>Update AMAD Flowset</name>
-    <group>AMADNG Info/Control Flowset v4.1.99.7</group>
+    <group>AMADNG Info/Control Flowset v4.1.99.8</group>
     <enabled>true</enabled>
     <executionPolicy>QUEUE</executionPolicy>
     <triggercontainer id="t1" x="420.0" y="-752.5" />
@@ -5241,7 +5241,7 @@ Soll der Assistent gelöscht werden?</actioncontainer>
   </flow>
   <flow type="flow">
     <name>VoiceControl</name>
-    <group>AMADNG Info/Control Flowset v4.1.99.7</group>
+    <group>AMADNG Info/Control Flowset v4.1.99.8</group>
     <enabled>true</enabled>
     <executionPolicy>QUEUE</executionPolicy>
     <triggercontainer id="t1" x="70.0" y="-52.5" />
diff --git a/74_AMADtaskerset_4.1.99.6.prj.xml b/74_AMADtaskerset_4.1.99.8.prj.xml
similarity index 100%
rename from 74_AMADtaskerset_4.1.99.6.prj.xml
rename to 74_AMADtaskerset_4.1.99.8.prj.xml