diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 36041504..f819f25a 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Database/Controllers/NcToolManagerController.cs b/Step.Database/Controllers/NcToolManagerController.cs
index 0c4f2cee..0fa88486 100644
--- a/Step.Database/Controllers/NcToolManagerController.cs
+++ b/Step.Database/Controllers/NcToolManagerController.cs
@@ -343,7 +343,8 @@ namespace Step.Database.Controllers
         public void DeleteTool(int toolId)
         {
             DbNcToolModel tool = FindTool(toolId);
-            DeleteTool(tool);
+            if(tool != null)
+                DeleteTool(tool);
         }
 
         public void DeleteTool(DbNcToolModel tool)
diff --git a/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs b/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs
index e54966ea..06b31061 100644
--- a/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs
+++ b/Step.Model/DTOModels/Scada/ScadaSchemaModel.cs
@@ -180,7 +180,6 @@ namespace Step.Model.DTOModels.Scada
 
         [XmlElement("memValueIndex")]
         public string MemValueIndex { get; set; }
-
     }
 
     public class ScadaSchemaClickModel
@@ -214,5 +213,8 @@ namespace Step.Model.DTOModels.Scada
         
         [XmlElement("action")]
         public string Action { get; set; }
+        
+        [XmlElement("round")]
+        public int Round { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 497446d5..d50fbe76 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -1365,7 +1365,7 @@ namespace Step.NC
         public CmsError GetM155Data(out List<DTOM155InputModel> data)
         {
             data = new List<DTOM155InputModel>();
-            List<M155InputIsNeededModel> ncData = new List<M155InputIsNeededModel>();
+            List<M155InputIsNeededModel> ncData = new List<M155InputIsNeededModel>();  
             CmsError cmsError = numericalControl.PLC_ROperatorInputIsNeeded(ref ncData);
             if (cmsError.IsError())
                 return cmsError;
@@ -1446,8 +1446,7 @@ namespace Step.NC
             if (action == "plus")
                 sign = HEAD_OVERRIDE_SIGN.PLUS;
 
-            CmsError cmsError = numericalControl.PLC_WHeadOverride(id, sign);
-            return cmsError;
+            return numericalControl.PLC_WHeadOverride(id, sign);
         }
 
         public CmsError PutPowerOnData(uint id)
@@ -1547,6 +1546,9 @@ namespace Step.NC
 
                 if (!ToolManagerConfig.BallufOpt)
                     categories.Add("balluf");
+                
+                if (!ToolManagerConfig.ReviveOpt)
+                    categories.Add("revive");
 
                 config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
                 config.FamiliesConfiguration.FamilyConfiguration = config.FamiliesConfiguration.FamilyConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
@@ -1936,18 +1938,16 @@ namespace Step.NC
             {
                 using (var dbContextTransaction = toolsManager.dbCtx.Database.BeginTransaction())
                 {
-                    // Delete db tool
-                    toolsManager.DeleteTool(tool.ToolId);
-                    
                     if (!ToolManagerConfig.FamilyOpt)
                     {
                         DbNcFamilyModel fam = toolsManager.FindFamily(tool.FamilyId);
                         // Check if family is connected to other tools
-                        if (fam != null && fam.Tools.Count() == 1)
+                        if (fam != null && fam.Tools.Count() == 1) 
                         {
                             toolsManager.DeleteFamily(fam.FamilyId);
                         }
                     }
+
                     DbNcShankModel shank = null;
                     if (!ToolManagerConfig.ShankOpt && tool.ShankId != null)
                     {
@@ -1957,6 +1957,9 @@ namespace Step.NC
                         toolsManager.DeleteNcShank(shank.ShankId);
                     }
 
+                    // Delete db tool
+                    toolsManager.DeleteTool(tool.ToolId);
+
                     bool startIsActive = false;
                     CmsError cmsError = NO_ERROR;
 
@@ -2533,11 +2536,19 @@ namespace Step.NC
                         if (cmsError.IsError())
                             return cmsError;
 
+                        SCADA_MEM_TYPE type = SupportFunctions.GetMemTypeFromString(layer.Inputs[i].Status.Type);
                         // Read value from PLC
-                        cmsError = numericalControl.PLC_RScadaValue(layer.Inputs[i].Status.MemValueIndex, SupportFunctions.GetMemTypeFromString(layer.Inputs[i].Status.Type), ref val2);
+                        cmsError = numericalControl.PLC_RScadaValue(layer.Inputs[i].Status.MemValueIndex, type, ref val2);
                         if (cmsError.IsError())
                             return cmsError;
 
+                        // if type is real approximate to configurated decimal digits
+                        if(type == SCADA_MEM_TYPE.REAL)
+                        {
+                            double tmpVal = Math.Round(Convert.ToDouble(val2), layer.Inputs[i].Status.Round);
+                            val2 = tmpVal;
+                        }
+
                         // Populate & add new object into scada model
                         scadaValue.Inputs.Add(new DTOScadaInputModel()
                         {