diff --git a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
index 3a8f3372..38621467 100644
--- a/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
+++ b/EgtBEAMWALL.ViewerOptimizer/ProdManager/ProdManagerVM.vb
@@ -153,7 +153,16 @@ Public Class ProdManagerVM
    Public Sub Save()
       Map.refSceneHostVM.SaveProject()
       Map.refMainWindowVM.SetTitle(CurrProd.nProdId.ToString("0000") & " - EgtBEAMWALL")
-      'DbControllers.m_ProdController.up
+      Dim MyMachGroupList As New List(Of Core.MyMachGroup)
+      'For Each MachGroup In Map.refProjectVM.MachGroupPanelVM.MachGroupList
+      '   MyMachGroupList.Add(New Core.MyMachGroup())
+      'Next
+      If Map.refMachinePanelVM.SelectedMachine.nType = MachineType.BEAM Then
+         MyMachGroupList = Map.refProjectVM.MachGroupPanelVM.MachGroupList.Select(Function(x) New Core.BeamMachGroup(x.Id, x.Name, x.Machine))
+      ElseIf Map.refMachinePanelVM.SelectedMachine.nType = MachineType.wall Then
+         MyMachGroupList = Map.refProjectVM.MachGroupPanelVM.MachGroupList.Select(Function(x) New Core.WallMachGroup(x.Id, x.Name, x.Machine))
+      End If
+      DbControllers.m_ProdController.UpdateMachGroup(CurrProd.nProdId, MyMachGroupList)
       ' se nuovo progetto, incremento l'indice di progetto
       If m_CurrProd.NewProd Then
          m_nLastProdId = m_nLastProdId + 1