diff --git a/dist/autoloader.js b/dist/autoloader.js
index 6064bc3..2b06ab1 100755
--- a/dist/autoloader.js
+++ b/dist/autoloader.js
@@ -1,4 +1,4 @@
-/*Generated on:Mon Dec 17 2018 17:55:17 GMT+0100 (CET)*/
+/*Generated on:Mon Dec 17 2018 18:02:39 GMT+0100 (CET)*/
 var AutomaticDispose_Branch = "master";
 var AutomaticDispose_URL = "https://jf.git.rest/Jomaar/automatic-dispose/raw/branch/";
 var da_lss_adis_time = new Date().getTime();
diff --git a/dist/autoloaderV2.js b/dist/autoloaderV2.js
index 4731488..cd4fe7f 100644
--- a/dist/autoloaderV2.js
+++ b/dist/autoloaderV2.js
@@ -1,4 +1,4 @@
-/*Generated on:Mon Dec 17 2018 17:55:17 GMT+0100 (CET)*/
+/*Generated on:Mon Dec 17 2018 18:02:39 GMT+0100 (CET)*/
 /*
  * Dexie.js - a minimalistic wrapper for IndexedDB
  * ===============================================
@@ -18833,41 +18833,49 @@ class AutomaticDispose {
             // console.log("Window", window.name);
             // console.log("self.MyRunner", self.MyRunner);
             // console.log("self.MyRunnerSettings", self.MyRunnerSettings);
-            return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
-                self.ADSettings().then((setting) => {
-                    if (setting[self.MyRunnerSettings] === 'true') {
-                        let where = {
-                            missionID: self.MissionID,
-                            runner: self.MyRunner,
-                            done: 'false'
-                        }
-                        // console.log(where);
-                        return self.ADisDB.ADisMissions.where(where).and(function (item) {
-                            return item.next_check <= Math.floor(new Date().getTime() / 1000)
-                        }).limit(1)
-                    }
-                }).then((Wunsch) => {
-                    if (Wunsch !== undefined) {
-                        return Wunsch.count(function (count) {
-                            if (count > 0) {
-                                return Wunsch.each((mywunsch) => {
-                                    return self.MainHandler()
-                                });
-                            } else {
-                                //return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
-                                return self.UpdateMissionsToDone(self.MissionID).then(() => {
-                                    return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
-                                })
-                                //})
-                            }
-                        });
-                    } else {
-                        return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
-                            return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
-                        })
-                    }
+
+            if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
+                console.log("DONE: " + self.MissionID);
+                return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                    return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
                 })
-            })
+            } else {
+                return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
+                    self.ADSettings().then((setting) => {
+                        if (setting[self.MyRunnerSettings] === 'true') {
+                            let where = {
+                                missionID: self.MissionID,
+                                runner: self.MyRunner,
+                                done: 'false'
+                            }
+                            // console.log(where);
+                            return self.ADisDB.ADisMissions.where(where).and(function (item) {
+                                return item.next_check <= Math.floor(new Date().getTime() / 1000)
+                            }).limit(1)
+                        }
+                    }).then((Wunsch) => {
+                        if (Wunsch !== undefined) {
+                            return Wunsch.count(function (count) {
+                                if (count > 0) {
+                                    return Wunsch.each((mywunsch) => {
+                                        return self.MainHandler()
+                                    });
+                                } else {
+                                    //return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                                    return self.UpdateMissionsToDone(self.MissionID).then(() => {
+                                        return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                                    })
+                                    //})
+                                }
+                            });
+                        } else {
+                            return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                                return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                            })
+                        }
+                    })
+                })
+            }
         }, 1500);
     }
 
@@ -18879,8 +18887,7 @@ class AutomaticDispose {
             return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
                 return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
             })
-        }
-        if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
+        } else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
             console.log("SEND: " + self.MissionID);
             return self.UpdateMissionsToDone(self.MissionID).then(() => {
                 return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full
diff --git a/src/autoloaderV2.js b/src/autoloaderV2.js
index 452d1e7..b872f6c 100644
--- a/src/autoloaderV2.js
+++ b/src/autoloaderV2.js
@@ -1173,41 +1173,49 @@ class AutomaticDispose {
             // console.log("Window", window.name);
             // console.log("self.MyRunner", self.MyRunner);
             // console.log("self.MyRunnerSettings", self.MyRunnerSettings);
-            return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
-                self.ADSettings().then((setting) => {
-                    if (setting[self.MyRunnerSettings] === 'true') {
-                        let where = {
-                            missionID: self.MissionID,
-                            runner: self.MyRunner,
-                            done: 'false'
-                        }
-                        // console.log(where);
-                        return self.ADisDB.ADisMissions.where(where).and(function (item) {
-                            return item.next_check <= Math.floor(new Date().getTime() / 1000)
-                        }).limit(1)
-                    }
-                }).then((Wunsch) => {
-                    if (Wunsch !== undefined) {
-                        return Wunsch.count(function (count) {
-                            if (count > 0) {
-                                return Wunsch.each((mywunsch) => {
-                                    return self.MainHandler()
-                                });
-                            } else {
-                                //return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
-                                return self.UpdateMissionsToDone(self.MissionID).then(() => {
-                                    return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
-                                })
-                                //})
-                            }
-                        });
-                    } else {
-                        return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
-                            return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
-                        })
-                    }
+
+            if (self.includesString($('#iframe-inside-container > div.missionNotFound > div.missionNotFoundText').text(), 'Der Einsatz wurde erfolgreich abgeschlossen.')) {
+                console.log("DONE: " + self.MissionID);
+                return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                    return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
                 })
-            })
+            } else {
+                return self.ADisDB.transaction('rw', [self.ADisDB.ADisMissions], () => {
+                    self.ADSettings().then((setting) => {
+                        if (setting[self.MyRunnerSettings] === 'true') {
+                            let where = {
+                                missionID: self.MissionID,
+                                runner: self.MyRunner,
+                                done: 'false'
+                            }
+                            // console.log(where);
+                            return self.ADisDB.ADisMissions.where(where).and(function (item) {
+                                return item.next_check <= Math.floor(new Date().getTime() / 1000)
+                            }).limit(1)
+                        }
+                    }).then((Wunsch) => {
+                        if (Wunsch !== undefined) {
+                            return Wunsch.count(function (count) {
+                                if (count > 0) {
+                                    return Wunsch.each((mywunsch) => {
+                                        return self.MainHandler()
+                                    });
+                                } else {
+                                    //return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                                    return self.UpdateMissionsToDone(self.MissionID).then(() => {
+                                        return tellParent(`console.log('wunsch:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                                    })
+                                    //})
+                                }
+                            });
+                        } else {
+                            return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
+                                return tellParent(`console.log('wunsch:2000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`);
+                            })
+                        }
+                    })
+                })
+            }
         }, 1500);
     }
 
@@ -1219,8 +1227,7 @@ class AutomaticDispose {
             return self.RemoveMissionsFromQueue(self.MissionID).then(() => {
                 return tellParent(`console.log('handler:1000:done:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // delete Mission here as completed
             })
-        }
-        if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
+        } else if (self.includesString($('#iframe-inside-container > div.alert.fade.in.alert-success').text(), "wurde erfolgreich informiert") /*|| $('#vehicle_show_table_all input[type="checkbox"]:checked').size() > 0*/ ) {
             console.log("SEND: " + self.MissionID);
             return self.UpdateMissionsToDone(self.MissionID).then(() => {
                 return tellParent(`console.log('handler:2000:update:${window.name}:${self.MissionID}');window.AutomaticDisposeCall.FreeIframe('${self.MyRunner}');`); // update Mission here as updated or full