diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index 12db0fe6..50639be0 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -342,6 +342,7 @@ namespace Step.Database.Controllers
 
         public DbNcShankModel UpdateShank(DbNcShankModel dbShank, DTONewNcShankModel dtoShank)
         {
+            dbShank.Balluf = dtoShank.Balluf;
             dbShank.MagazinePositionType = dtoShank.MagazinePositionType;
 
             dbCtx.SaveChanges();
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 2fb461a7..1d73ddcb 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -917,42 +917,54 @@ namespace Step.NC
             if (NcConfig.NcVendor != NC_VENDOR.SIEMENS)
             {
                 List<string> categories = new List<string>();
-
+                config.MagPositionOptionActive = true;
                 if (ToolManagerConfig.ShankOpt)
-                    categories.Add("shank");
+                {
+                    config.MultitoolOptionActive = true;
+                    categories.Add("shankType");
+                }
 
                 if (ToolManagerConfig.FamilyOpt)
+                {
+                    config.FamilyOptionActive = true;
                     categories.Add("family");
+                }
 
-                if (ToolManagerConfig.OffsetOpt)
+                if (!ToolManagerConfig.OffsetOpt)
                     categories.Add("offset");
 
-                if (ToolManagerConfig.TcpOpt)
+                if (!ToolManagerConfig.TcpOpt)
                     categories.Add("tcp");
 
-                if (ToolManagerConfig.CoolingOpt)
+                if (!ToolManagerConfig.CoolingOpt)
                     categories.Add("cooling");
 
-                if (ToolManagerConfig.DynamicCompensationOpt)
+                if (!ToolManagerConfig.DynamicCompensationOpt)
                     categories.Add("dynamicCompensation");
 
-                if (ToolManagerConfig.GammaOpt)
+                if (!ToolManagerConfig.GammaOpt)
                     categories.Add("gamma");
 
-                if (ToolManagerConfig.LifeOpt)
+                if (!ToolManagerConfig.LifeOpt)
                     categories.Add("life");
 
-                if (ToolManagerConfig.MagPosTypeOpt)
+                if (!ToolManagerConfig.MagPosTypeOpt)
                     categories.Add("magPos");
 
-                if (ToolManagerConfig.MultidimensionalShankOpt)
+                if (!ToolManagerConfig.MultidimensionalShankOpt)
                     categories.Add("shankOpt");
 
-                if (ToolManagerConfig.SelfAdaptivePathOpt)
+                if (!ToolManagerConfig.SelfAdaptivePathOpt)
                     categories.Add("selfAdaptive");
 
-                if (ToolManagerConfig.BallufOpt)
-                    categories.Add("ballufOpt");
+                if (!ToolManagerConfig.BallufOpt)
+                    categories.Add("balluf");
+                
+                config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
+                config.FamiliesConfiguration.FamilyConfiguration = config.FamiliesConfiguration.FamilyConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
+                config.ShanksConfiguration.ShankConfiguration = config.ShanksConfiguration.ShankConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
+                config.MagazinePosConfiguration = config.MagazinePosConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
+
             }
 
             return cmsError;