diff --git a/DiffractionGratings/grating3D.geo b/DiffractionGratings/grating3D.geo
index b422f75ee9ceb843a19024801495c3bf35989405..690b336a33b0554cbc8dabd607ffa3cf6f0e675f 100644
--- a/DiffractionGratings/grating3D.geo
+++ b/DiffractionGratings/grating3D.geo
@@ -9,7 +9,7 @@ Include StrCat["grating3D_data_",test_case,".geo"];
 SetFactory("OpenCASCADE");
 
 Macro SetPBCs
-  e = 10*nm;
+  e = 5*nm;
   masterX() = Surface In BoundingBox{-period_x/2-e,-period_y/2-e, PML_bot_hh-e,-period_x/2+e, period_y/2+e, PML_top_hh+PML_top+e};
   slaveX()  = Surface In BoundingBox{ period_x/2-e,-period_y/2-e, PML_bot_hh-e, period_x/2+e, period_y/2+e, PML_top_hh+PML_top+e};
   masterY() = Surface In BoundingBox{-period_x/2-e,-period_y/2-e, PML_bot_hh-e, period_x/2+e,-period_y/2+e, PML_top_hh+PML_top+e};
diff --git a/DiffractionGratings/grating3D_data_2Dlamellar.geo b/DiffractionGratings/grating3D_data_2Dlamellar.geo
index ebdb8a8b15b253fb9fe544fd9b71cf5a766add5d..236fcb9f4374a9095287bfd9f8e5782b73ad2607 100644
--- a/DiffractionGratings/grating3D_data_2Dlamellar.geo
+++ b/DiffractionGratings/grating3D_data_2Dlamellar.geo
@@ -15,9 +15,9 @@ DefineConstant[
     thick_L_1     = {200    , Name StrCat[pp2,"/3thickness layer 1 [nm] (superstrate)"]},
     thick_L_2     = {200    , Name StrCat[pp2,"/4thickness layer 2 [nm]"]},
     thick_L_3     = {1050   , Name StrCat[pp2,"/5thickness layer 3 [nm]"]},
-    thick_L_4     = {20     , Name StrCat[pp2,"/6thickness layer 4 [nm]"]},
-    thick_L_5     = {300     , Name StrCat[pp2,"/7thickness layer 5 [nm]"]},
-    thick_L_6     = {50    , Name StrCat[pp2,"/8thickness layer 6 [nm] (substrate)"]},
+    thick_L_4     = {150     , Name StrCat[pp2,"/6thickness layer 4 [nm]"]},
+    thick_L_5     = {150     , Name StrCat[pp2,"/7thickness layer 5 [nm]"]},
+    thick_L_6     = {100    , Name StrCat[pp2,"/8thickness layer 6 [nm] (substrate)"]},
 
     tag_geom      = {  7      , Name StrCat[pp3,"/0Shape"], Choices {1="Pyramid",2="Cylindrical Hole",3="Torus",4="HalfEllipspoid",5="Checkerboard",6="bi-sinusoidal",7="2D lamellar"}},
     rx            = { 0     , Name StrCat[pp3,"/1rx"]},
@@ -48,17 +48,17 @@ DefineConstant[
      
     og            = {0          , Name StrCat[pp5,"/0geometrical order [-]"]  , Choices {0="1",1="2"} },
     oi            = {1          , Name StrCat[pp5,"/0interpolation order [-]"], Choices {0="1",1="2"} },
-    paramaille    = {20         , Name StrCat[pp5,"/1Number of mesh elements per wavelength [-]"]},
-    lc_scat       = {20         , Name StrCat[pp5,"/2Scatterer absolute mesh size [nm]"]},
+    paramaille    = {15         , Name StrCat[pp5,"/1Number of mesh elements per wavelength [-]"]},
+    lc_scat       = {15         , Name StrCat[pp5,"/2Scatterer absolute mesh size [nm]"]},
     PML_top       = {lambda0*1  , Name StrCat[pp5,"/4PML top thickness [nm]"]},
     PML_bot       = {lambda0/5  , Name StrCat[pp5,"/5PML bot thickness [nm]"]},
     Nmax          = {1          , Name StrCat[pp5,"/6Number of non specular order to output [-]"]},
     refine_mesh_L_1= {1         , Name StrCat[pp5,"/7refine layers/1refine mesh layer 1 [-]"]},
     refine_mesh_L_2= {1         , Name StrCat[pp5,"/7refine layers/2refine mesh layer 2 [-]"]},
     refine_mesh_L_3= {1         , Name StrCat[pp5,"/7refine layers/3refine mesh layer 3 [-]"]},
-    refine_mesh_L_4= {0.2       , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
-    refine_mesh_L_5= {0.1       , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
-    refine_mesh_L_6= {0.1       , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
+    refine_mesh_L_4= {0.3       , Name StrCat[pp5,"/7refine layers/4refine mesh layer 4 [-]"]},
+    refine_mesh_L_5= {0.3       , Name StrCat[pp5,"/7refine layers/5refine mesh layer 5 [-]"]},
+    refine_mesh_L_6= {0.3       , Name StrCat[pp5,"/7refine layers/6refine mesh layer 6 [-]"]},
     
     InterpSampling     = { 30   , Name StrCat[pp6,"/0Interpolation grid step [nm]"]},
     Flag_interp_cubic  = { 0    , Name StrCat[pp6,"/1Interpolate on cubic grid?"], Choices {0,1} },