diff --git a/src/AasxIntegrationBase/AasxMenu.cs b/src/AasxIntegrationBase/AasxMenu.cs
index 5729db47..5aa0c309 100644
--- a/src/AasxIntegrationBase/AasxMenu.cs
+++ b/src/AasxIntegrationBase/AasxMenu.cs
@@ -622,7 +622,7 @@ public AasxMenu AddLambda(
         // Operate
         //
 
-        public async Task ActivateAction(AasxMenuItemBase mi, AasxMenuActionTicket ticket)
+        public async Task ActivateAction(AasxMenuItemBase mi, AasxMenuActionTicket ticket, Action<object> lambdaDone = null)
         {
             var name = mi?.Name?.Trim()?.ToLower();
 
@@ -634,6 +634,8 @@ public async Task ActivateAction(AasxMenuItemBase mi, AasxMenuActionTicket ticke
                 await this.DefaultActionAsync(name, mi, ticket);
             else if (this.DefaultAction != null)
                 this.DefaultAction(name, mi, ticket);
+
+            lambdaDone?.Invoke(this);
         }
 
         //
diff --git a/src/AasxPackageExplorer/debug.MIHO.script b/src/AasxPackageExplorer/debug.MIHO.script
index 89f89f87..943bf9a6 100644
--- a/src/AasxPackageExplorer/debug.MIHO.script
+++ b/src/AasxPackageExplorer/debug.MIHO.script
@@ -48,25 +48,25 @@
 // WriteLine(GetLastLogLine());
 // TakeScreenShot("Test123");
 
-Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\00_FestoDemoBox-Module-2.aasx");
-Select("AAS", "First");
-Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
-Sleep(6000);
+//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\00_FestoDemoBox-Module-2.aasx");
+//Select("AAS", "First");
+//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
+//Sleep(1000);
 
-Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\12_article-dpdm-32-instance_1.aasx");
-Select("AAS", "First");
-Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
-Sleep(6000);
+//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\12_article-dpdm-32-instance_1.aasx");
+//Select("AAS", "First");
+//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
+//Sleep(1000);
 
-Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\13_article-dpdm-32-instance_2.aasx");
-Select("AAS", "First");
-Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
-Sleep(6000);
+//Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\13_article-dpdm-32-instance_2.aasx");
+//Select("AAS", "First");
+//Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
+//Sleep(1000);
 
 //Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\16_article-ovel-10.aasx");
 //Select("AAS", "First");
 //Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
-//Sleep(6000);
+//Sleep(1000);
 
 //Tool("Open", "File", "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\17_article-spau.aasx");
 //Select("AAS", "First");
@@ -108,3 +108,26 @@ Sleep(6000);
 //Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
 //Sleep(1000);
 
+
+var fns = [
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\00_FestoDemoBox-Module-2.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\\12_article-dpdm-32-instance_1.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\13_article-dpdm-32-instance_2.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\16_article-ovel-10.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\17_article-spau.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\18_article-vuvg-l14_1.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\18_article-vuvg-l14_2.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\20_Festo_579071_SMT-8M-A-PS-24V-E-0.3-M12_proximity_switch.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\21_article-elgs-45-200.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\22_article-CPX-E-CEC-M1-PN.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\30_Festo_SPAU_VR3.aasx",
+    "C:\\HOMI\\Develop\\Aasx\\repo_Festo_demo_case_V3\31_HMI22_Festo_CMMT.aasx"
+];
+
+foreach (fn in fns)
+{
+    Tool("Open", "File", fn);
+    Select("AAS", "First");
+    Tool("apiuploadassistant", "BaseAddress", "http://localhost:5001/api/v3.0/", "IncludeSubmodels", true, "IncludeCDs", true, "IncludeSupplFiles", true, "OverwriteIfExist", true);
+    Sleep(1000);
+}
\ No newline at end of file
diff --git a/src/AasxPackageLogic/AasxScript.cs b/src/AasxPackageLogic/AasxScript.cs
index d38fbbbf..7856da49 100644
--- a/src/AasxPackageLogic/AasxScript.cs
+++ b/src/AasxPackageLogic/AasxScript.cs
@@ -31,7 +31,7 @@ namespace AasxPackageExplorer
     /// </summary>
     public interface IAasxScriptRemoteInterface
     {
-        Task<int> Tool(object[] args);
+        Task<int> Tool(object[] args, Action<object> lambdaDone);
         Aas.IReferable Select(object[] args);
         Aas.IReferable[] SelectAll(object[] args);
         Task<bool> Location(object[] args);
@@ -95,7 +95,82 @@ public virtual object Invoke(IScriptContext context, object[] args)
             }
         }
 
-        public class Script_WriteLine : ScriptInvokableBase
+        public class ScriptInvokableBaseAsync : ScriptInvokableBase
+        {
+            protected static int _mutex = 0;
+
+            public ScriptInvokableBaseAsync(AasxScript script) : base(script) 
+            {
+            }
+
+            public virtual async Task<object> InnerInvoke(IScriptContext context, object[] args)
+            {
+                await Task.Yield();
+                return 0;
+            }
+
+            public override object Invoke(IScriptContext context, object[] args)
+            {
+                // debug
+                if (_script._logLevel >= 2)
+                    Log.Singleton.Info($"Execute {this.GetType().Name} " + string.Join(",", args));
+
+                // for the outer script loop, wait for any invocation the Task to be completed!
+                int n = 0;
+                while (_mutex > 0)
+                {
+                    n++;
+                    Thread.Sleep(100);
+                }
+                if (_script._logLevel >= 2 && n > 0)
+                    Log.Singleton.Info($"Waiting for mutex = {_mutex} the time of {n} x 100ms.");
+
+                // inner
+                object res = 0;
+                if (Application.Current != null)
+                {
+                    // WPF case
+                    Task<object> x = null;
+                    x = Application.Current.Dispatcher.Invoke(async () =>
+                    {
+                        if (_script?.Remote == null)
+                            return -1;
+
+                        lock (_script)
+                        {
+                            _mutex = 1 + (new Random()).Next(98);
+                        }
+
+                        if (_script._logLevel >= 2)
+                            Log.Singleton.Info($"Started new mutex = {_mutex} and going to invocation of script function ..");
+
+                        res = await InnerInvoke(context, args);
+
+                        if (_script._logLevel >= 2)
+                            Log.Singleton.Info($".. done with result = {res}.");   
+                        
+                        return res;
+                    });
+                    if (x != null)
+                        Log.Singleton.Silent("" + x + " ");
+                    res = x.Result;
+                }
+                else
+                {
+                    // Blazor?? case
+                    res = _script.Remote?.Select(args);
+                }
+
+                // debug
+                if (_script._logLevel >= 2)
+                    Log.Singleton.Info($"Finalized execute {this.GetType().Name} " + string.Join(",", args));
+
+                // end
+                return res;
+            }
+        }
+
+        public class Script_WriteLine : ScriptInvokableBaseAsync
         {
             public Script_WriteLine(AasxScript script) : base(script)
             {
@@ -105,14 +180,21 @@ public Script_WriteLine(AasxScript script) : base(script)
                         .Add("<any>", "All arguments are writen to the scriot log."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
+                
                 _script?.ScriptLog?.Info("Script: " + string.Join(",", args));
+                lock (_script)
+                {
+                    _mutex = 0;
+                }
+
                 return 0;
             }
         }
 
-        public class Script_Sleep : ScriptInvokableBase
+        public class Script_Sleep : ScriptInvokableBaseAsync
         {
             public Script_Sleep(AasxScript script) : base(script)
             {
@@ -122,15 +204,21 @@ public Script_Sleep(AasxScript script) : base(script)
                         .Add("<time>", "Pause time in milli seconds."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
                 if (args != null && args.Length == 1 && args[0] is int a0i)
-                    Thread.Sleep(a0i);
+                    await Task.Delay(a0i);
+
+                lock (_script)
+                {
+                    _mutex = 0;
+                }
+
                 return 0;
             }
         }
 
-        public class Script_FileReadAll : ScriptInvokableBase
+        public class Script_FileReadAll : ScriptInvokableBaseAsync
         {
             public Script_FileReadAll(AasxScript script) : base(script)
             {
@@ -141,26 +229,34 @@ public Script_FileReadAll(AasxScript script) : base(script)
                         .Add("returns:", "All lines of text file as one string; null if file is not accessible."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
+                object res = null;
                 if (args != null && args.Length == 1 && args[0] is string fn)
                     try
                     {
                         if (!System.IO.File.Exists(fn))
                             return null;
                         using (var f = new StreamReader(fn))
-                            return f.ReadToEnd();
+                            res = f.ReadToEnd();
                     }
                     catch (Exception ex)
                     {
                         if (_script != null && _script._logLevel >= 2)
                             Log.Singleton.Error(ex, $"when reading text contents of {fn}");
                     }
-                return null;
+
+                lock (_script)
+                {
+                    _mutex = 0;
+                }
+
+                return res;
             }
         }
 
-        public class Script_FileExists : ScriptInvokableBase
+        public class Script_FileExists : ScriptInvokableBaseAsync
         {
             public Script_FileExists(AasxScript script) : base(script)
             {
@@ -171,24 +267,33 @@ public Script_FileExists(AasxScript script) : base(script)
                         .Add("returns:", "True, if file or path exists; null if not accessible."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
+                
+                var res = false;
                 if (args != null && args.Length == 1 && args[0] is string fn)
                     try
                     {
                         if (System.IO.File.Exists(fn) || Directory.Exists(fn))
-                            return true;
+                            res = true;
                     }
                     catch (Exception ex)
                     {
                         if (_script != null && _script._logLevel >= 2)
                             Log.Singleton.Error(ex, $"when check existence of {fn}");
                     }
-                return false;
+
+                lock (_script)
+                {
+                    _mutex = 0;
+                }
+
+                return res;
             }
         }
 
-        public class Script_GetLastLogLine : ScriptInvokableBase
+        public class Script_GetLastLogLine : ScriptInvokableBaseAsync
         {
             public Script_GetLastLogLine(AasxScript script) : base(script)
             {
@@ -199,16 +304,24 @@ public Script_GetLastLogLine(AasxScript script) : base(script)
                         .Add("returns:", "Log line with attributes as string."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
                 int ofs = 0;
                 if (args != null && args.Length == 1 && args[0] is int i)
                     ofs = i;
-                return "" + Log.Singleton.GetLastLongTermPrint(ofs);
+                
+                var res = "" + Log.Singleton.GetLastLongTermPrint(ofs);
+                lock (_script)
+                {
+                    _mutex = 0;
+                }
+
+                return res;
             }
         }
 
-        public class Script_TakeScreenShot : ScriptInvokableBase
+        public class Script_TakeScreenShot : ScriptInvokableBaseAsync
         {
             public Script_TakeScreenShot(AasxScript script) : base(script)
             {
@@ -218,19 +331,25 @@ public Script_TakeScreenShot(AasxScript script) : base(script)
                         .Add("<file>", "Filename to save screenshot to."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
                 string fn = "noname";
                 if (args != null && args.Length == 1 && args[0] is string afn)
                     fn = afn;
+                
                 _script.Remote?.TakeScreenshot(fn);
+                lock (_script)
+                {
+                    _mutex = 0;
+                }
 
                 // done
                 return 0;
             }
         }
 
-        public class Script_Tool : ScriptInvokableBase
+        public class Script_Tool : ScriptInvokableBaseAsync
         {
             public Script_Tool(AasxScript script) : base(script)
             {
@@ -242,11 +361,7 @@ public Script_Tool(AasxScript script) : base(script)
                         .Add("<value>", "Arbitrary type and value for that argument."));
             }
 
-            protected static string _lockVar;
-
-            protected static int _mutex = 0;
-
-            public override async Task<object> Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
                 // access
                 if (_script == null)
@@ -258,73 +373,18 @@ public override async Task<object> Invoke(IScriptContext context, object[] args)
                     return -1;
                 }
 
-                // debug
-                if (_script._logLevel >= 2)
-                    Log.Singleton.Info($"Execute Tool " + string.Join(",", args));
-
-                // for the outer script loop, wait for any invocation the Task to be completed!
-                while (_mutex > 0)
-                {
-                    Log.Singleton.Info(StoredPrint.Color.Blue, $"waiting for _mutex = {_mutex}");
-                    await Task.Delay(1000);
-                }
-                lock (_lockVar)
-                {
-                    _mutex = 1 + (new Random()).Next(98);
-                }
-                Log.Singleton.Info(StoredPrint.Color.Blue, $"started new _mutex = {_mutex}");
-
-                // invoke action
-                // https://stackoverflow.com/questions/39438441/
-                Task<int> x = null;
-                int y = 0;
-                if (Application.Current != null)
-                {
-                    // WPF case
-                    y = await Application.Current.Dispatcher.Invoke(async () =>
+                var res = await _script?.Remote?.Tool(args, 
+                    lambdaDone: (o) =>
                     {
-                        if (_script?.Remote == null)
-                            return -1;
-
-                        // hard wait until mutex is released ..
-                        while (_mutex > 0)
-                        {
-                            Log.Singleton.Info(StoredPrint.Color.Blue, $"waiting for _mutex = {_mutex}");
-                            await Task.Delay(1000);
-                        }
-                        
-
-                        var res = await _script?.Remote?.Tool(args);
-
-                        Log.Singleton.Info(StoredPrint.Color.Blue, $"resetting _mutex = {_mutex} to 0!");
-                        lock (_lockVar)
-                        {
-                            _mutex = 0;
-                        }
-
-                        Log.Singleton.Info(StoredPrint.Color.Blue, $"CALL of TOOl {res} DONE");
-                        return res;
+                        lock (_script) { _mutex = 0; }
                     });
-                    if (x != null)
-                        Log.Singleton.Silent("" + x + " " + y);
-                    Log.Singleton.Info(StoredPrint.Color.Blue, $"INVOKE of TOOl {y} DONE");                    
-                }
-                else
-                {
-                    // Blazor case
-                    await _script?.Remote?.Tool(args);
-                }
-
-                // debug
-                if (_script._logLevel >= 2)
-                    Log.Singleton.Info($"Finalized execute Tool " + string.Join(",", args));
 
                 // done
-                return 0;
+                return res;
             }
         }
 
-        public class Script_Select : ScriptInvokableBase
+        public class Script_Select : ScriptInvokableBaseAsync
         {
             public Script_Select(AasxScript script) : base(script)
             {
@@ -338,8 +398,10 @@ public Script_Select(AasxScript script) : base(script)
                         .Add("returns:", "Referable which is currently selected."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
+
                 // access
                 if (_script == null)
                     return -1;
@@ -354,37 +416,17 @@ public override object Invoke(IScriptContext context, object[] args)
                 if (_script._logLevel >= 2)
                     Log.Singleton.Info($"Execute Select " + string.Join(",", args));
 
-                // which application
-                if (Application.Current == null)
-                {
-                    Log.Singleton.Error("For script execution, Application.Current for Blazor is not available.");
-                }
-
-                // invoke action
-                // https://stackoverflow.com/questions/39438441/
-                Aas.IReferable x = null;
-                if (Application.Current != null)
-                {
-                    // WPF case
-                    x = Application.Current?.Dispatcher.Invoke(() =>
-                    {
-                        return _script.Remote?.Select(args);
-                    });
-                    if (x != null)
-                        Log.Singleton.Silent("" + x.IdShort);
-                }
-                else
-                {
-                    // Blazor?? case
-                    x = _script.Remote?.Select(args);
+                var res = _script?.Remote?.Select(args);
+                lock (_script) { 
+                    _mutex = 0; 
                 }
 
                 // done
-                return x;
+                return res;
             }
         }
 
-        public class Script_SelectAll : ScriptInvokableBase
+        public class Script_SelectAll : ScriptInvokableBaseAsync
         {
             public Script_SelectAll(AasxScript script) : base(script)
             {
@@ -395,8 +437,10 @@ public Script_SelectAll(AasxScript script) : base(script)
                         .Add("returns:", "Enumeration of Referables of certain kind."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
+
                 // access
                 if (_script == null)
                     return -1;
@@ -407,41 +451,18 @@ public override object Invoke(IScriptContext context, object[] args)
                     return -1;
                 }
 
-                // debug
-                if (_script._logLevel >= 2)
-                    Log.Singleton.Info($"Execute SelectAll " + string.Join(",", args));
-
-                // which application
-                if (Application.Current == null)
+                var res =  _script.Remote?.SelectAll(args);
+                lock (_script)
                 {
-                    Log.Singleton.Error("For script execution, Application.Current for Blazor is not available.");
-                }
-
-                // invoke action
-                // https://stackoverflow.com/questions/39438441/
-                Aas.IReferable[] x = null;
-                if (Application.Current != null)
-                {
-                    // WPF case
-                    x = Application.Current?.Dispatcher.Invoke(() =>
-                    {
-                        return _script.Remote?.SelectAll(args);
-                    });
-                    if (x != null)
-                        Log.Singleton.Silent("" + x.Count());
-                }
-                else
-                {
-                    // Blazor?? case
-                    x = _script.Remote?.SelectAll(args);
+                    _mutex = 0;
                 }
 
                 // done
-                return x;
+                return res;
             }
         }
 
-        public class Script_Location : ScriptInvokableBase
+        public class Script_Location : ScriptInvokableBaseAsync
         {
             public Script_Location(AasxScript script) : base(script)
             {
@@ -451,8 +472,10 @@ public Script_Location(AasxScript script) : base(script)
                         .Add("<cmd>", "Either 'Push' or 'Pop'."));
             }
 
-            public async override Task<object> Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
+
                 // access
                 if (_script == null)
                     return -1;
@@ -477,30 +500,18 @@ public async override Task<object> Invoke(IScriptContext context, object[] args)
                 if (_script._logLevel >= 2)
                     Log.Singleton.Info($"Execute Location " + string.Join(",", args));
 
-                // invoke action
-                // https://stackoverflow.com/questions/39438441/
-                bool x = false;
-                if (Application.Current != null)
+                var res = await _script.Remote?.Location(args);
+                lock (_script)
                 {
-                    // WPF case
-                    x = await Application.Current.Dispatcher.Invoke(async () =>
-                    {
-                        return await _script.Remote?.Location(args);
-                    });
-                    Log.Singleton.Silent("" + x);
-                }
-                else
-                {
-                    // Blazor case
-                    x = await _script.Remote?.Location(args);
+                    _mutex = 0;
                 }
 
                 // done
-                return 0;
+                return res;
             }
         }
 
-        public class Script_System : ScriptInvokableBase
+        public class Script_System : ScriptInvokableBaseAsync
         {
             public Script_System(AasxScript script) : base(script)
             {
@@ -510,8 +521,10 @@ public Script_System(AasxScript script) : base(script)
                         .Add("<any>", "All arguments are passed to the command line."));
             }
 
-            public override object Invoke(IScriptContext context, object[] args)
+            public override async Task<object> InnerInvoke(IScriptContext context, object[] args)
             {
+                await Task.Yield();
+
                 // access
                 if (_script == null)
                     return -1;
@@ -555,6 +568,11 @@ public override object Invoke(IScriptContext context, object[] args)
                 if (stderr?.HasContent() == true)
                     Log.Singleton.Info(StoredPrint.Color.Red, "Script: System: " + stderr);
 
+                lock (_script)
+                {
+                    _mutex = 0;
+                }
+
                 // done
                 return p.ExitCode;
             }
diff --git a/src/AasxPackageLogic/MainWindowScripting.cs b/src/AasxPackageLogic/MainWindowScripting.cs
index a91478ef..f5ee13ef 100644
--- a/src/AasxPackageLogic/MainWindowScripting.cs
+++ b/src/AasxPackageLogic/MainWindowScripting.cs
@@ -444,7 +444,9 @@ Aas.IReferable[] IAasxScriptRemoteInterface.SelectAll(object[] args)
             return new IReferable[0];
         }
 
-        public async Task<int> Tool(object[] args)
+        public async Task<int> Tool(
+            object[] args,
+            Action<object> lambdaDone)
         {
             if (args == null || args.Length < 1 || !(args[0] is string toolName))
             {
@@ -452,9 +454,6 @@ public async Task<int> Tool(object[] args)
                 return -1;
             }
 
-            var rndi = new Random().Next(100);
-            Log.Singleton.Info(StoredPrint.Color.Blue, $"TOOL {rndi} START");
-
             // name of tool, find it
             var foundMenu = MainWindow?.GetMainMenu();
             var mi = foundMenu.FindName(toolName);
@@ -511,7 +510,7 @@ public async Task<int> Tool(object[] args)
             }
 
             // invoke action
-            await foundMenu.ActivateAction(mi, ticket);
+            await foundMenu.ActivateAction(mi, ticket, lambdaDone: lambdaDone);
 
             // perform UI updates if required
             if (ticket.UiLambdaAction != null && !(ticket.UiLambdaAction is AnyUiLambdaActionNone))
@@ -520,9 +519,7 @@ public async Task<int> Tool(object[] args)
                 MainWindow.AddWishForToplevelAction(ticket.UiLambdaAction);
             }
 
-            Log.Singleton.Info(StoredPrint.Color.Blue, $"TOOL {rndi} DONE");
-
-            return rndi;
+            return 0;
         }
 
         async Task<bool> IAasxScriptRemoteInterface.Location(object[] args)