diff --git a/ceasiompy/SUMOAutoMesh/sumoautomesh.py b/ceasiompy/SUMOAutoMesh/sumoautomesh.py
index 9d4b581d4..879f66f23 100644
--- a/ceasiompy/SUMOAutoMesh/sumoautomesh.py
+++ b/ceasiompy/SUMOAutoMesh/sumoautomesh.py
@@ -316,11 +316,13 @@ def create_mesh(cpacs_path, cpacs_out_path):
         tixi.updateTextElement(SU2MESH_XPATH, str(mesh_out_path))
         mesh_path.unlink()
 
-    else:
+    elif output == "edge":
         create_branch(tixi, EDGE_MESH_XPATH)
         tixi.updateTextElement(EDGE_MESH_XPATH, str(mesh_out_path))
 
-        edge_aboc_path = Path(sumo_results_dir, "ToolOutput.aboc")
+        #edge_aboc_path = Path(sumo_results_dir, "ToolOutput.aboc")   # commented by Mengmeng
+        edge_aboc_name = aircraft_name(tixi) + f"_baseline.aboc"
+        edge_aboc_path = Path(sumo_results_dir, edge_aboc_name)
         shutil.copyfile(mesh_path, edge_aboc_path)
 
         create_branch(tixi, EDGE_ABOC_XPATH)
diff --git a/ceasiompy/utils/commonxpath.py b/ceasiompy/utils/commonxpath.py
index 4e11d1a7a..7f9117a4a 100644
--- a/ceasiompy/utils/commonxpath.py
+++ b/ceasiompy/utils/commonxpath.py
@@ -79,6 +79,7 @@
 SMFILE_XPATH = CEASIOMPY_XPATH + "/filesPath/SMpath"
 SU2MESH_XPATH = CEASIOMPY_XPATH + "/filesPath/su2Mesh"
 EDGE_MESH_XPATH = CEASIOMPY_XPATH + "/filesPath/edgeMesh"
+
 SUMOFILE_XPATH = CEASIOMPY_XPATH + "/filesPath/sumoFilePath"
 WKDIR_XPATH = CEASIOMPY_XPATH + "/filesPath/wkdirPath"
 
@@ -151,7 +152,7 @@
 EDGE_CFL_NB_XPATH = EDGE_XPATH + "/settings/cflNumber/value"
 EDGE_MG_LEVEL_XPATH = EDGE_XPATH + "/settings/multigridLevel"
 EDGE_FIXED_CL_XPATH = EDGE_XPATH + "/fixedCL"
-EDGE_SOLVER = EDGE_XPATH + "/solver"
+EDGE_SOLVER = EDGE_XPATH + "/solver"  # duplicate of EDGE_SOLVER_XPATH
 EDGE_ABOC_XPATH = EDGE_XPATH + "/boundary_condition"
 
 # RANGE