diff --git a/Test.UI/Components/Pages/Aedifica.razor.cs b/Test.UI/Components/Pages/Aedifica.razor.cs
index 02d45aa..faad37c 100644
--- a/Test.UI/Components/Pages/Aedifica.razor.cs
+++ b/Test.UI/Components/Pages/Aedifica.razor.cs
@@ -37,12 +37,12 @@ namespace Test.UI.Components.Pages
 
         protected Dictionary<string, string> m_CurrArgs = new Dictionary<string, string>();
 
-        protected override async Task OnInitializedAsync()
+        protected override Task OnInitializedAsync()
         {
             ConfInit();
             DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
             //await ReloadData();
-            await Task.Delay(1);
+            return Task.Delay(1);
         }
 
         private void ConfInit()
diff --git a/Test.UI/Components/Pages/BaseEdit.razor.cs b/Test.UI/Components/Pages/BaseEdit.razor.cs
index 96bd8e4..48bd8d7 100644
--- a/Test.UI/Components/Pages/BaseEdit.razor.cs
+++ b/Test.UI/Components/Pages/BaseEdit.razor.cs
@@ -514,7 +514,7 @@ namespace Test.UI.Components.Pages
         /// Rilettura dati
         /// </summary>
         /// <returns></returns>
-        private async Task ReloadData()
+        private Task ReloadData()
         {
             //return base.OnInitializedAsync();
             AvailHardwareList = new List<Hardware>();
@@ -527,7 +527,7 @@ namespace Test.UI.Components.Pages
                     AvailHardwareList.Add(item);
                 }
             }
-            await Task.Delay(100);
+            return Task.Delay(100);
         }
 
         private void updateInfoJwd(string currSer, string? newFamilyHardware, Hardware? newHardware, string? newColorMaterial, string? newMaterial, string? newGlass, string? newProfile)
diff --git a/Test.UI/Components/Pages/EditJWD.razor.cs b/Test.UI/Components/Pages/EditJWD.razor.cs
index 8e1dcad..a9107f6 100644
--- a/Test.UI/Components/Pages/EditJWD.razor.cs
+++ b/Test.UI/Components/Pages/EditJWD.razor.cs
@@ -585,7 +585,7 @@ namespace Test.UI.Components.Pages
         /// Rilettura dati
         /// </summary>
         /// <returns></returns>
-        private async Task ReloadData()
+        private Task ReloadData()
         {
             AvailHardwareList = new List<Hardware>();
             if (File.Exists(cFileHardware))
@@ -597,7 +597,7 @@ namespace Test.UI.Components.Pages
                     AvailHardwareList.Add(item);
                 }
             }
-            await Task.Delay(100);
+            return Task.Delay(100);
         }
 
         private void updateInfoJwd(string currSer, string? newFamilyHardware, Hardware? newHardware, string? newColorMaterial, string? newMaterial, string? newGlass, string? newProfile)
diff --git a/Test.UI/Components/Pages/Home.razor.cs b/Test.UI/Components/Pages/Home.razor.cs
index 9efeaad..09fc270 100644
--- a/Test.UI/Components/Pages/Home.razor.cs
+++ b/Test.UI/Components/Pages/Home.razor.cs
@@ -115,7 +115,7 @@ namespace Test.UI.Components.Pages
                 isInteractive = true;
             }
         }
-        protected override async Task OnInitializedAsync()
+        protected override Task OnInitializedAsync()
         {
             ConfInit();
             Random random = new Random();
@@ -124,7 +124,7 @@ namespace Test.UI.Components.Pages
             DLService.PipeSvg.EA_NewMessage += PipeSvg_EA_NewMessage;
             DLService.PipeShape.EA_NewMessage += PipeShape_EA_NewMessage;
             DLService.PipeHwOpt.EA_NewMessage += PipeHwOption_EA_NewMessage;
-            await ReloadData();
+            return ReloadData();
         }
 
         #endregion Protected Methods
diff --git a/Test.UI/Components/Pages/SimpleEditOld.razor.cs b/Test.UI/Components/Pages/SimpleEditOld.razor.cs
index 52d2709..292c672 100644
--- a/Test.UI/Components/Pages/SimpleEditOld.razor.cs
+++ b/Test.UI/Components/Pages/SimpleEditOld.razor.cs
@@ -329,7 +329,7 @@ namespace Test.UI.Components.Pages
         /// Rilettura dati
         /// </summary>
         /// <returns></returns>
-        private async Task ReloadData()
+        private Task ReloadData()
         {
             //return base.OnInitializedAsync();
             AvailHardwareList = new List<Hardware>();
@@ -342,7 +342,7 @@ namespace Test.UI.Components.Pages
                     AvailHardwareList.Add(item);
                 }
             }
-            await Task.Delay(100);
+            return Task.Delay(100);
         }
 
         #endregion Private Methods
diff --git a/WebWindowComplex/Compo/AreaFrame.razor.cs b/WebWindowComplex/Compo/AreaFrame.razor.cs
index b4c30d0..48180ac 100644
--- a/WebWindowComplex/Compo/AreaFrame.razor.cs
+++ b/WebWindowComplex/Compo/AreaFrame.razor.cs
@@ -39,18 +39,18 @@ namespace WebWindowComplex.Compo
         /// Sollevo evento richiesta aggiunta sash su frame
         /// </summary>
         /// <returns></returns>
-        private async Task RaiseAddSash()
+        private Task RaiseAddSash()
         {
-            await EC_AddSash.InvokeAsync(true);
+            return EC_AddSash.InvokeAsync(true);
         }
 
         /// <summary>
         /// Sollevo evento richiesta aggiunta split su frame
         /// </summary>
         /// <returns></returns>
-        private async Task RaiseAddSplit()
+        private Task RaiseAddSplit()
         {
-            await EC_AddSplit.InvokeAsync(true);
+            return EC_AddSplit.InvokeAsync(true);
         }
 
         #endregion Private Methods
diff --git a/WebWindowComplex/Compo/AreaHwOption.razor.cs b/WebWindowComplex/Compo/AreaHwOption.razor.cs
index ecdf397..f184a3d 100644
--- a/WebWindowComplex/Compo/AreaHwOption.razor.cs
+++ b/WebWindowComplex/Compo/AreaHwOption.razor.cs
@@ -58,13 +58,13 @@ namespace WebWindowComplex.Compo
         /// </summary>
         /// <param name="updRec"></param>
         /// <returns></returns>
-        private async Task RaiseOptCombo(AGBOptionCombo updRec)
+        private Task RaiseOptCombo(AGBOptionCombo updRec)
         {
             var args = new DataUpdateHwOption
             {
                 AGBOptCombo = updRec
             };
-            await EC_UpdateHwOpt.InvokeAsync(args);
+            return EC_UpdateHwOpt.InvokeAsync(args);
         }
 
         /// <summary>
@@ -72,13 +72,13 @@ namespace WebWindowComplex.Compo
         /// </summary>
         /// <param name="updRec"></param>
         /// <returns></returns>
-        private async Task RaiseOptText(AGBOptionText updRec)
+        private Task RaiseOptText(AGBOptionText updRec)
         {
             var args = new DataUpdateHwOption
             {
                 AGBOptText = updRec
             };
-            await EC_UpdateHwOpt.InvokeAsync(args);
+            return EC_UpdateHwOpt.InvokeAsync(args);
         }
 
         private bool IsLoadingHwOpt
diff --git a/WebWindowComplex/Compo/AreaSash.razor.cs b/WebWindowComplex/Compo/AreaSash.razor.cs
index a4eaf32..3ad50dc 100644
--- a/WebWindowComplex/Compo/AreaSash.razor.cs
+++ b/WebWindowComplex/Compo/AreaSash.razor.cs
@@ -193,11 +193,11 @@ namespace WebWindowComplex.Compo
         /// Sollevo evento richiesta per cambiare tutti i Joint
         /// </summary>
         /// <returns></returns>
-        private async Task ChangeAllJoints(Json.WindowConst.Joints JointType)
+        private Task ChangeAllJoints(Json.WindowConst.Joints JointType)
         {
             foreach (var item in CurrSashDim.JointList)
                 item.SetSelJointType(JointType);
-            await EC_UpdateSashDim.InvokeAsync(CurrSashDim);
+            return EC_UpdateSashDim.InvokeAsync(CurrSashDim);
         }
 
         /// <summary>
@@ -238,7 +238,7 @@ namespace WebWindowComplex.Compo
         /// Metodo per cambiare l'anta su cui è presente la maniglia
         /// </summary>
         /// <returns></returns>
-        private async Task ChangeHandle()
+        private Task ChangeHandle()
         {
             // Cerco la Sash che si sta considerando nella lista Sash
             var s = SashList.Where(x => x.GroupId == CurrSashGroup.GroupId).FirstOrDefault();
@@ -284,14 +284,14 @@ namespace WebWindowComplex.Compo
                 sash = CurrSashGroup,
                 reqProfile = true
             };
-            await EC_UpdateSash.InvokeAsync(args);
+            return EC_UpdateSash.InvokeAsync(args);
         }
         
         /// <summary>
         /// Copio contenuto anta da indexCopy a IndexModify
         /// </summary>
         /// <returns></returns>
-        private async Task CopyContentSash(int IndexCopy, int IndexModify)
+        private Task CopyContentSash(int IndexCopy, int IndexModify)
         {
             isOpen = !isOpen;
             // Anta selezionata
@@ -307,14 +307,14 @@ namespace WebWindowComplex.Compo
                 sash = CurrSashGroup,
                 reqProfile = true
             };
-            await EC_UpdateSash.InvokeAsync(args);
+            return EC_UpdateSash.InvokeAsync(args);
         }
 
         /// <summary>
         /// Metodo per aggiungere lo split nella singola anta
         /// </summary>
         /// <returns></returns>
-        private async Task AddSplitToSash()
+        private Task AddSplitToSash()
         {
             CurrAnta.AddSplit();
             DataUpdateProfile args = new DataUpdateProfile()
@@ -322,7 +322,7 @@ namespace WebWindowComplex.Compo
                 sash = CurrSashGroup,
                 reqProfile = true
             };
-            await EC_UpdateSash.InvokeAsync(args);
+            return EC_UpdateSash.InvokeAsync(args);
         }
 
         private bool isOpen = false;
diff --git a/WebWindowComplex/Compo/AreaSplit.razor.cs b/WebWindowComplex/Compo/AreaSplit.razor.cs
index aba53c8..3594d1a 100644
--- a/WebWindowComplex/Compo/AreaSplit.razor.cs
+++ b/WebWindowComplex/Compo/AreaSplit.razor.cs
@@ -40,26 +40,23 @@ namespace WebWindowComplex.Compo
         /// Metodo per copiare sash
         /// </summary>
         /// <returns></returns>
-        private async Task RaiseCopySash(int indexCurrSash)
+        private Task RaiseCopySash(int indexCurrSash)
         {
-            //Rimuovo contenuto di Splitted e rimuovo area da conteggio gruppi
             CurrSplitted.AreaList.RemoveAll(i => i != null);
-            // Copio sash
             Area a = SashList[indexCurrSash].Copy(CurrSplitted);
             a.SetParentArea(CurrSplitted);
-            // Aggiungo copia a Splitted
             CurrSplitted.AreaList.Add(a);
-            await EC_UpdateSplitted.InvokeAsync(CurrSplitted);
+            return EC_UpdateSplitted.InvokeAsync(CurrSplitted);
         }
 
         /// <summary>
         /// Metodo per aggiungere prima sash
         /// </summary>
         /// <returns></returns>
-        private async Task RaiseAddSash()
+        private Task RaiseAddSash()
         {
             CurrSplitted.AddFirstSash();
-            await EC_UpdateSplitted.InvokeAsync(CurrSplitted);
+            return EC_UpdateSplitted.InvokeAsync(CurrSplitted);
         }
 
         #endregion Private Methods
diff --git a/WebWindowComplex/Compo/CardArcElement.razor.cs b/WebWindowComplex/Compo/CardArcElement.razor.cs
index 6d9646a..aac2d0e 100644
--- a/WebWindowComplex/Compo/CardArcElement.razor.cs
+++ b/WebWindowComplex/Compo/CardArcElement.razor.cs
@@ -28,13 +28,10 @@ namespace WebWindowComplex.Compo
 
         #endregion Public Properties
 
-        private async Task UpdatePreview()
+        private Task UpdatePreview()
         {
-            var args = new DataUpdateFrame
-            {
-                currFrame = CurrFrame
-            };
-            await EC_UpdatePreview.InvokeAsync(args);
+            var args = new DataUpdateFrame { currFrame = CurrFrame };
+            return EC_UpdatePreview.InvokeAsync(args);
         }
 
         private async Task UpdatePreviewSash(Sash CurrSashGRoup)
diff --git a/WebWindowComplex/Compo/CardFill.razor.cs b/WebWindowComplex/Compo/CardFill.razor.cs
index f1e1c36..e392a10 100644
--- a/WebWindowComplex/Compo/CardFill.razor.cs
+++ b/WebWindowComplex/Compo/CardFill.razor.cs
@@ -47,10 +47,10 @@ namespace WebWindowComplex.Compo
         /// </summary>
         /// <param name="reqFillType"> tipo di fill richiesto </param>
         /// <returns></returns>
-        protected async Task ChangeOneFill(FillTypes reqFillType)
+        protected Task ChangeOneFill(FillTypes reqFillType)
         {
             CurrFill.SetFillType(reqFillType);
-            await EC_UpdateFill.InvokeAsync(CurrFill);
+            return EC_UpdateFill.InvokeAsync(CurrFill);
         }
 
         #endregion Protected Methods
diff --git a/WebWindowComplex/Compo/CardFrame.razor.cs b/WebWindowComplex/Compo/CardFrame.razor.cs
index 72c3603..f5f13ba 100644
--- a/WebWindowComplex/Compo/CardFrame.razor.cs
+++ b/WebWindowComplex/Compo/CardFrame.razor.cs
@@ -191,7 +191,7 @@ namespace WebWindowComplex.Compo
         /// Metodo per cambiare tutti i joint
         /// </summary>
         /// <returns></returns>
-        private async Task ChangeAllJoints(Json.WindowConst.Joints JointType, Area a)
+        private Task ChangeAllJoints(Json.WindowConst.Joints JointType, Area a)
         {
             if (a is Frame)
             {
@@ -200,12 +200,8 @@ namespace WebWindowComplex.Compo
                     joint.SetSelJointType(JointType);
                 }
             }
-            var args = new DataUpdateFrame()
-            {
-                currFrame = CurrFrameWindow,
-                svgNoHw = false
-            };
-            await EC_UpdateFrame.InvokeAsync(args);
+            var args = new DataUpdateFrame() { currFrame = CurrFrameWindow, svgNoHw = false };
+            return EC_UpdateFrame.InvokeAsync(args);
         }
 
         /// <summary>
diff --git a/WebWindowComplex/Compo/CardSashGroup.razor.cs b/WebWindowComplex/Compo/CardSashGroup.razor.cs
index da4f366..608ce00 100644
--- a/WebWindowComplex/Compo/CardSashGroup.razor.cs
+++ b/WebWindowComplex/Compo/CardSashGroup.razor.cs
@@ -255,19 +255,15 @@ namespace WebWindowComplex.Compo
         /// </summary>
         /// <param name="type"></param>
         /// <returns></returns>
-        protected async Task SetMeasureType(MeasureTypes type)
+        protected Task SetMeasureType(MeasureTypes type)
         {
             isOpen = !isOpen;
-            for(int i = 0; i < CurrSashGroup.SashList.Count; i++)
+            for (int i = 0; i < CurrSashGroup.SashList.Count; i++)
             {
                 CurrSashGroup.SashList.ElementAt(i).SetSelMeasureType(type, i);
             }
-            var args = new DataUpdateSash
-            {
-                currSash = CurrSashGroup,
-                noSvg = true
-            };
-            await EC_UpdateSashGroup.InvokeAsync(args);
+            var args = new DataUpdateSash { currSash = CurrSashGroup, noSvg = true };
+            return EC_UpdateSashGroup.InvokeAsync(args);
         }
 
         /// <summary>
@@ -331,9 +327,9 @@ namespace WebWindowComplex.Compo
             }
         }
 
-        protected async Task ResetDict(DataUpdateRes args)
+        protected Task ResetDict(DataUpdateRes args)
         {
-            await EC_ReqResetDict.InvokeAsync(args);
+            return EC_ReqResetDict.InvokeAsync(args);
         }
 
         #endregion Protected Methods
@@ -407,14 +403,10 @@ namespace WebWindowComplex.Compo
         /// </summary>
         /// <param name="updRec"></param>
         /// <returns></returns>
-        private async Task FirstHwOptionList()
+        private Task FirstHwOptionList()
         {
-            var args = new DataUpdateSash
-            {
-                currSash = CurrSashGroup
-            };
-            //await EC_UpdatePreview.InvokeAsync(args);
-            await EC_ReqFirstOptionHw.InvokeAsync(CurrSashGroup);
+            var args = new DataUpdateSash { currSash = CurrSashGroup };
+            return EC_ReqFirstOptionHw.InvokeAsync(CurrSashGroup);
         }
 
         private string ButtonMeasureCss(MeasureTypes type)
diff --git a/WebWindowComplex/Compo/CardSplit.razor.cs b/WebWindowComplex/Compo/CardSplit.razor.cs
index 40efacc..95c5e5a 100644
--- a/WebWindowComplex/Compo/CardSplit.razor.cs
+++ b/WebWindowComplex/Compo/CardSplit.razor.cs
@@ -313,7 +313,7 @@ namespace WebWindowComplex.Compo
         /// </summary>
         /// <param name="type"> nuovo tipo </param>
         /// <returns></returns>
-        protected async Task SetMeasureType(MeasureTypes type)
+        protected Task SetMeasureType(MeasureTypes type)
         {
             isOpen = !isOpen;
             foreach (var item in CurrSplit.SplitVertList)
@@ -329,7 +329,7 @@ namespace WebWindowComplex.Compo
                 currSplit = CurrSplit,
                 noSvg = true
             };
-            await EC_UpdateSplit.InvokeAsync(args);
+            return EC_UpdateSplit.InvokeAsync(args);
         }
     }
 
diff --git a/WebWindowComplex/Compo/CardTree.razor.cs b/WebWindowComplex/Compo/CardTree.razor.cs
index ad4d1b5..3309ac6 100644
--- a/WebWindowComplex/Compo/CardTree.razor.cs
+++ b/WebWindowComplex/Compo/CardTree.razor.cs
@@ -32,14 +32,14 @@ namespace WebWindowComplex.Compo
         /// Metodo per richiesta prossimo step
         /// </summary>
         /// <returns></returns>
-        private async Task RaiseNextStep(CompileStep cs, int indexStep)
+        private Task RaiseNextStep(CompileStep cs, int indexStep)
         {
             var Args = new DataNextStep
             {
                 currCompileStep = cs,
                 index = indexStep,
             };
-            await EC_NextStep.InvokeAsync(Args);
+            return EC_NextStep.InvokeAsync(Args);
         }
 
         //private async Task Remove(CompileStep cs, int indexStep)
diff --git a/WebWindowComplex/TableComp.razor.cs b/WebWindowComplex/TableComp.razor.cs
index 0fb1fe4..042d94e 100644
--- a/WebWindowComplex/TableComp.razor.cs
+++ b/WebWindowComplex/TableComp.razor.cs
@@ -389,10 +389,10 @@ namespace WebWindowComplex
         /// Richiesta chiusura SENZA salvataggio (= restore prev)
         /// </summary>
         /// <returns></returns>
-        protected async Task DoClose()
+        protected Task DoClose()
         {
             editLock = false;
-            await EC_OnClose.InvokeAsync(false);
+            return EC_OnClose.InvokeAsync(false);
         }
 
         /// <summary>
@@ -519,8 +519,9 @@ namespace WebWindowComplex
         /// <summary>
         /// Metodo di reset
         /// </summary>
-        protected async Task DoReset()
+        protected Task DoReset()
         {
+            return Task.CompletedTask;
             // Da fare
         }
 
@@ -528,11 +529,11 @@ namespace WebWindowComplex
         /// Richiesta chiusura con salvataggio
         /// </summary>
         /// <returns></returns>
-        protected async Task DoSave()
+        protected Task DoSave()
         {
             editLock = false;
             //manca salvataggio JWD
-            await EC_OnClose.InvokeAsync(true);
+            return EC_OnClose.InvokeAsync(true);
         }
 
         protected override void OnAfterRender(bool firstRender)
@@ -661,7 +662,7 @@ namespace WebWindowComplex
             }
         }
 
-        private async Task BuildFrameDefault()
+        private Task BuildFrameDefault()
         {
             // Costruisco window e setto i parametri
             Window window = new Window();
@@ -702,7 +703,7 @@ namespace WebWindowComplex
             string jwd = JsonConvert.SerializeObject(jsonWindow);
             JsonWindow WindowFromJson = JsonConvert.DeserializeObject<JsonWindow>(jwd, new PolymorphicJsonConverter()) ?? new JsonWindow("", "", "", "");
             setCurrWindow(WindowFromJson);
-            await DoPreviewSvg(true);
+            return DoPreviewSvg(true);
         }
 
         /// <summary>
@@ -1087,9 +1088,9 @@ namespace WebWindowComplex
         /// Richiesta reset dizionario Shape con action
         /// </summary>
         /// <param name="args"></param>
-        private async Task ReqResetDict(DataUpdateRes args)
+        private Task ReqResetDict(DataUpdateRes args)
         {
-            await EC_ActionReq.InvokeAsync(args.req);
+            return EC_ActionReq.InvokeAsync(args.req);
         }
 
         /// <summary>
@@ -1284,10 +1285,10 @@ namespace WebWindowComplex
         /// </summary>
         /// <param name="reqFillType"> tipo di fill richiesto </param>
         /// <returns></returns>
-        protected async Task ChangeAllFill(FillTypes reqFillType)
+        protected Task ChangeAllFill(FillTypes reqFillType)
         {
             updateAllFill(FrameWindow, reqFillType);
-            await DoPreviewSvg();
+            return DoPreviewSvg();
         }
 
         /// <summary>
diff --git a/WebWindowComplex/WebWindowComplex.csproj b/WebWindowComplex/WebWindowComplex.csproj
index fe5b1c6..521971c 100644
--- a/WebWindowComplex/WebWindowComplex.csproj
+++ b/WebWindowComplex/WebWindowComplex.csproj
@@ -6,7 +6,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>3.1.2.417</Version>
+    <Version>3.1.2.418</Version>
     <Authors>Annamaria Sassi</Authors>
     <Company>Egalware</Company>
     <Description>Componente gestione Configurazioni avanzate Window per LUX</Description>
@@ -74,6 +74,10 @@
 
 
 
+
+
+
+
 
 
 
diff --git a/WebWindowConfigurator/WebWindowConfigurator.csproj b/WebWindowConfigurator/WebWindowConfigurator.csproj
index fec646c..902517d 100644
--- a/WebWindowConfigurator/WebWindowConfigurator.csproj
+++ b/WebWindowConfigurator/WebWindowConfigurator.csproj
@@ -6,7 +6,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
-        <Version>3.1.2.417</Version>
+        <Version>3.1.2.418</Version>
         <Authors>Annamaria Sassi</Authors>
         <Company>Egalware</Company>
         <Description>Componente gestione JWD per LUX</Description>
@@ -95,6 +95,8 @@
 
 
 
+
+
 
 
 
diff --git a/WebWindowTest/Test.razor.cs b/WebWindowTest/Test.razor.cs
index 1e5be91..10e1484 100644
--- a/WebWindowTest/Test.razor.cs
+++ b/WebWindowTest/Test.razor.cs
@@ -481,8 +481,9 @@ namespace WebWindowTest
         /// <summary>
         /// Metodo di reset
         /// </summary>
-        protected async Task DoReset()
+        protected Task DoReset()
         {
+            return Task.CompletedTask;
             // Da fare
         }