diff --git a/MP-TAB-SERV/Components/LongStopList.razor b/MP-TAB-SERV/Components/LongStopList.razor
index bc9ae031..c1566122 100644
--- a/MP-TAB-SERV/Components/LongStopList.razor
+++ b/MP-TAB-SERV/Components/LongStopList.razor
@@ -53,40 +53,6 @@
                     </div>
                 }                
             </div>
-            <div>
-                @if (currNotes.Count > 0)
-                {
-                    @*<div class="accordion" id="@($"{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
-            <div class="accordion-item">
-            <h2 class="accordion-header" id="@($"{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}One")">
-            <button class="accordion-button  collapsed borderStd p-1 " type="button" data-bs-toggle="collapse" data-bs-target="#@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")" aria-expanded="false" aria-controls="@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
-            @($"{currNotes.Count} commenti")
-            </button>
-            </h2>
-            <div id="@($"collapse_{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")" class="accordion-collapse collapse" aria-labelledby="headingOne" data-bs-parent="@($"#{currFnq.IdxMacchina}_{currFnq.InizioStato.ToString("dd_mm_yy")}")">
-            <div class="accordion-body p-1">
-            @foreach (var note in currNotes)
-            {
-            <div class="d-flex justify-content-between mb-1">
-            <button class="btn btn-sm btn-info">C</button>
-            <span class="p-1">@note.Value</span>
-            <button class="btn btn-sm btn-danger">D</button>
-            </div>
-            }
-            </div>
-            </div>
-            </div>
-            </div>*@
-                }
-                else
-                {
-                    @*<div>
-            <div class="borderStd p-1" style="background-color: #6C757D;">
-            @($"{currNotes.Count} commenti")
-            </div>
-            </div>*@
-                }
-            </div>
         </div>
         <div class="w-100">
             @if (showComments)
@@ -95,7 +61,7 @@
                     @foreach (var note in currNotes)
                     {
                         <div class="d-flex justify-content-between align-items-center mb-1 col-12">
-                            <button class="btn btn-sm btn-info h-50"><i class="fa-solid fa-pen-to-square"></i></button>
+                            <button class="btn btn-sm btn-info h-50" @onclick="()=>doSet2Edit(note)"><i class="fa-solid fa-pen-to-square"></i></button>
                             <span class="p-1">@note.Value</span>
                             <button class="btn btn-sm btn-danger h-50" @onclick="()=>doDelete(note)"><i class="fa-solid fa-trash-can"></i></button>
                         </div>
diff --git a/MP-TAB-SERV/Components/LongStopList.razor.cs b/MP-TAB-SERV/Components/LongStopList.razor.cs
index b26b7eaa..589f6d9b 100644
--- a/MP-TAB-SERV/Components/LongStopList.razor.cs
+++ b/MP-TAB-SERV/Components/LongStopList.razor.cs
@@ -17,6 +17,8 @@ namespace MP_TAB_SERV.Components
         public List<CommentiModel> currNotes { get; set; } = new List<CommentiModel>();
         [Parameter]
         public EventCallback<bool> E_relData { get; set; }
+        [Parameter]
+        public EventCallback<CommentiModel> E_setComm { get; set; }
 
         #endregion Public Properties
 
@@ -120,6 +122,10 @@ namespace MP_TAB_SERV.Components
             }
 
         }
+        protected async Task doSet2Edit(CommentiModel currNote)
+        {
+            await E_setComm.InvokeAsync(currNote);
+        }
 
         #endregion Private Methods
     }
diff --git a/MP-TAB-SERV/Components/NotesEditor.razor.cs b/MP-TAB-SERV/Components/NotesEditor.razor.cs
index 30135b33..1b6771e1 100644
--- a/MP-TAB-SERV/Components/NotesEditor.razor.cs
+++ b/MP-TAB-SERV/Components/NotesEditor.razor.cs
@@ -29,6 +29,19 @@ namespace MP_TAB_SERV.Components
 
         [Parameter]
         public bool CanSave { get; set; } = false;
+        [Parameter]
+        public CommentiModel? CurrComm
+        {
+            set
+            {
+                if (value != null)
+                {
+                    DateSel = value.InizioStato;
+                    UserComment = value.Value;
+                    ShowBtn = false;
+                }
+            }
+        }
 
         [Parameter]
         public EventCallback<string> E_CommRec { get; set; }
diff --git a/MP-TAB-SERV/Components/NotesMan.razor b/MP-TAB-SERV/Components/NotesMan.razor
index fd43198b..8d43a10c 100644
--- a/MP-TAB-SERV/Components/NotesMan.razor
+++ b/MP-TAB-SERV/Components/NotesMan.razor
@@ -1,5 +1,5 @@
 
-<NotesEditor CanSave="true" Title="Nuovo Commento" RecMSE="@RecMSE" E_Updated="DoUpdate" CurrRecord="@currEv"></NotesEditor>
+<NotesEditor CanSave="true" Title="Nuovo Commento" RecMSE="@RecMSE" E_Updated="DoUpdate" CurrRecord="@currEv" CurrComm="currComm"></NotesEditor>
 
 <div class="row mt-1">
     <div class="col-12 pr-1">
@@ -45,7 +45,7 @@
         <div class="row flex-wrap">
             @foreach (var item in RecordListFull)
             {
-                <LongStopList currFnq="@item.Fermata" currNotes="@item.CommentiFermata" E_relData="reloadAfterDelOrUpd"></LongStopList>
+                <LongStopList currFnq="@item.Fermata" currNotes="@item.CommentiFermata" E_relData="reloadAfterDelOrUpd" E_setComm="setCurrComm"></LongStopList>
             }
         </div>
 
diff --git a/MP-TAB-SERV/Components/NotesMan.razor.cs b/MP-TAB-SERV/Components/NotesMan.razor.cs
index 891ee70c..da0df09a 100644
--- a/MP-TAB-SERV/Components/NotesMan.razor.cs
+++ b/MP-TAB-SERV/Components/NotesMan.razor.cs
@@ -3,6 +3,7 @@ using Microsoft.JSInterop;
 using MP.Data.DatabaseModels;
 using MP.Data.DTO;
 using MP.Data.Services;
+using NLog.LayoutRenderers.Wrappers;
 
 namespace MP_TAB_SERV.Components
 {
@@ -94,6 +95,17 @@ namespace MP_TAB_SERV.Components
             }
         }
 
+        protected CommentiModel? currComm { get; set; } = null;
+
+        protected async Task setCurrComm(CommentiModel _CurrComm)
+        {
+            await Task.Delay(1);
+            if(_CurrComm != null)
+            {
+                currComm = _CurrComm;
+            }
+        }
+
         protected async Task EditRec(CommentiModel currRec)
         {
             await Task.Delay(1);
diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj
index f4f6b3fc..a2fda2a2 100644
--- a/MP-TAB-SERV/MP-TAB-SERV.csproj
+++ b/MP-TAB-SERV/MP-TAB-SERV.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <Nullable>enable</Nullable>
-      <Version>6.16.2310.3117</Version>
+      <Version>6.16.2311.609</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>MP_TAB_SERV</RootNamespace>
   </PropertyGroup>
diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html
index dcc264dc..b96c808a 100644
--- a/MP-TAB-SERV/Resources/ChangeLog.html
+++ b/MP-TAB-SERV/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo MAPOSPEC </i>
-    <h4>Versione: 6.16.2310.3117</h4>
+    <h4>Versione: 6.16.2311.609</h4>
     <br /> Note di rilascio:
     <ul>
         <li>
diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt
index a52150d6..68df9744 100644
--- a/MP-TAB-SERV/Resources/VersNum.txt
+++ b/MP-TAB-SERV/Resources/VersNum.txt
@@ -1 +1 @@
-6.16.2310.3117
+6.16.2311.609
diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml
index 51e111c4..cd97a6ec 100644
--- a/MP-TAB-SERV/Resources/manifest.xml
+++ b/MP-TAB-SERV/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>6.16.2310.3117</version>
+  <version>6.16.2311.609</version>
   <url>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip</url>
   <changelog>https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html</changelog>
   <mandatory>false</mandatory>