diff --git a/docs/_toc.yml b/docs/_toc.yml
index 40d99004..4830e7f3 100644
--- a/docs/_toc.yml
+++ b/docs/_toc.yml
@@ -1,5 +1,5 @@
 # Table of contents
-# Learn more at https://jupyterbook.org/customize/toc.html
+# Learn more at https://jterbook.org/customize/toc.html
 
 format: jb-book
 root: index
@@ -8,4 +8,15 @@ chapters:
   - file: components
   - file: components_plot
   - file: tutorial
+    sections:
+        - file: notebooks/00_layout
+        - file: notebooks/11_sparameters
+        - file: notebooks/11_sparameters_gratings
+        - file: notebooks/12_sim_plugins_tidy3d
+        - file: notebooks/13_sim_plugins
+        - file: notebooks/14_sax_tidy3d
+        - file: notebooks/21_schematic_driven_layout
+        - file: notebooks/31_data_analysis_mzi
+        - file: notebooks/32_data_analysis_ring
+        - file: notebooks/33_data_analysis_dbr
   - file: changelog
diff --git a/pyproject.toml b/pyproject.toml
index 4baa6cd1..91f30f8f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -22,7 +22,7 @@ authors = [
 keywords = ["python"]
 license = {file = "LICENSE"}
 dependencies = [
-    "gdsfactory[cad,kfactory]==6.109.2",
+    "gdsfactory==6.115.0",
     "modes",
 ]
 readme = "README.md"
@@ -30,7 +30,7 @@ requires-python = ">=3.7"
 
 [project.optional-dependencies]
 full = [
-    "gdsfactory[full]==6.109.2",
+    "gdsfactory[full]==6.115.0",
     "modes",
     ]
 
diff --git a/tests/ref/add_fiber_array_pads_rf.gds b/tests/ref/add_fiber_array_pads_rf.gds
index 5d0ec0f9..ee6639b7 100644
Binary files a/tests/ref/add_fiber_array_pads_rf.gds and b/tests/ref/add_fiber_array_pads_rf.gds differ
diff --git a/tests/ref/dbg.gds b/tests/ref/dbg.gds
index 0d35e742..b60200fa 100644
Binary files a/tests/ref/dbg.gds and b/tests/ref/dbg.gds differ
diff --git a/tests/ref/dbr_cavity.gds b/tests/ref/dbr_cavity.gds
index 32093144..8b316ea3 100644
Binary files a/tests/ref/dbr_cavity.gds and b/tests/ref/dbr_cavity.gds differ
diff --git a/tests/ref/dbr_cavity_add_fiber_ar_f2ab6ad2.gds b/tests/ref/dbr_cavity_add_fiber_ar_f2ab6ad2.gds
index 11fb5110..0ceb2122 100644
Binary files a/tests/ref/dbr_cavity_add_fiber_ar_f2ab6ad2.gds and b/tests/ref/dbr_cavity_add_fiber_ar_f2ab6ad2.gds differ
diff --git a/tests/ref/mzi_ab5edfa6.gds b/tests/ref/mzi_ab5edfa6.gds
index 35063f1b..109de17e 100644
Binary files a/tests/ref/mzi_ab5edfa6.gds and b/tests/ref/mzi_ab5edfa6.gds differ
diff --git a/tests/ref/pad_array_71569d1c.gds b/tests/ref/pad_array_71569d1c.gds
index 53709355..71b20d4f 100644
Binary files a/tests/ref/pad_array_71569d1c.gds and b/tests/ref/pad_array_71569d1c.gds differ
diff --git a/tests/ref/ring_double_heater_171f554b.gds b/tests/ref/ring_double_heater_171f554b.gds
index 32de60a2..eb9c9e05 100644
Binary files a/tests/ref/ring_double_heater_171f554b.gds and b/tests/ref/ring_double_heater_171f554b.gds differ
diff --git a/tests/ref/ring_single_heater_171f554b.gds b/tests/ref/ring_single_heater_171f554b.gds
index e9fed9bc..f2693a74 100644
Binary files a/tests/ref/ring_single_heater_171f554b.gds and b/tests/ref/ring_single_heater_171f554b.gds differ
diff --git a/tests/ref/ring_single_heater_171f_5dab5bcc.gds b/tests/ref/ring_single_heater_171f_5dab5bcc.gds
index d7361c84..cf18a780 100644
Binary files a/tests/ref/ring_single_heater_171f_5dab5bcc.gds and b/tests/ref/ring_single_heater_171f_5dab5bcc.gds differ
diff --git a/tests/ref/ring_single_heater_171f_ac60d9ba.gds b/tests/ref/ring_single_heater_171f_ac60d9ba.gds
index b8627121..2c164004 100644
Binary files a/tests/ref/ring_single_heater_171f_ac60d9ba.gds and b/tests/ref/ring_single_heater_171f_ac60d9ba.gds differ
diff --git a/tests/ref/via_stack_627f28a4.gds b/tests/ref/via_stack_627f28a4.gds
index f0864f7d..8abc2b4b 100644
Binary files a/tests/ref/via_stack_627f28a4.gds and b/tests/ref/via_stack_627f28a4.gds differ
diff --git a/tests/test_components/test_pdk_settings_add_fiber_array_.yml b/tests/test_components/test_pdk_settings_add_fiber_array_.yml
index 4ea919fa..0a5ad43a 100644
--- a/tests/test_components/test_pdk_settings_add_fiber_array_.yml
+++ b/tests/test_components/test_pdk_settings_add_fiber_array_.yml
@@ -118,7 +118,7 @@ settings:
         settings:
           polarization: te
           taper_angle: 35
-      layer_label: TEXT
+      layer_label: LABEL
       select_ports:
         function: select_ports
         settings:
diff --git a/tests/test_components/test_pdk_settings_add_fiber_array_pads_rf_.yml b/tests/test_components/test_pdk_settings_add_fiber_array_pads_rf_.yml
index d598b974..480914be 100644
--- a/tests/test_components/test_pdk_settings_add_fiber_array_pads_rf_.yml
+++ b/tests/test_components/test_pdk_settings_add_fiber_array_pads_rf_.yml
@@ -2,25 +2,97 @@ name: add_fiber_array_pads_rf
 ports:
   e1:
     center:
-    - 160.055
-    - -60.5
+    - 160.05
+    - -435.5
     layer:
     - 12
     - 0
     name: e1
-    orientation: 180
+    orientation: 180.0
     port_type: electrical
     shear_angle: null
     width: 75
   e2:
     center:
-    - 160.055
-    - 64.5
+    - 160.05
+    - -310.5
     layer:
     - 12
     - 0
     name: e2
-    orientation: 180
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  e3:
+    center:
+    - 160.05
+    - -185.5
+    layer:
+    - 12
+    - 0
+    name: e3
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  e4:
+    center:
+    - 160.05
+    - -60.5
+    layer:
+    - 12
+    - 0
+    name: e4
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  e5:
+    center:
+    - 160.05
+    - 64.5
+    layer:
+    - 12
+    - 0
+    name: e5
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  e6:
+    center:
+    - 160.05
+    - 189.5
+    layer:
+    - 12
+    - 0
+    name: e6
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  e7:
+    center:
+    - 160.05
+    - 314.5
+    layer:
+    - 12
+    - 0
+    name: e7
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  e8:
+    center:
+    - 160.05
+    - 439.5
+    layer:
+    - 12
+    - 0
+    name: e8
+    orientation: 180.0
     port_type: electrical
     shear_angle: null
     width: 75
diff --git a/tests/test_components/test_pdk_settings_add_pads_dc_.yml b/tests/test_components/test_pdk_settings_add_pads_dc_.yml
index cfcb9a1e..e3febb3f 100644
--- a/tests/test_components/test_pdk_settings_add_pads_dc_.yml
+++ b/tests/test_components/test_pdk_settings_add_pads_dc_.yml
@@ -2,8 +2,8 @@ name: ring_single_heater_171f_5dab5bcc
 ports:
   elec-ring_single_heater_171f554b-0:
     center:
-    - -64.5
-    - 160.055
+    - -439.5
+    - 160.05
     layer:
     - 12
     - 0
@@ -14,8 +14,8 @@ ports:
     width: 75
   elec-ring_single_heater_171f554b-1:
     center:
-    - 60.5
-    - 160.055
+    - -314.5
+    - 160.05
     layer:
     - 12
     - 0
@@ -24,6 +24,78 @@ ports:
     port_type: electrical
     shear_angle: null
     width: 75
+  elec-ring_single_heater_171f554b-2:
+    center:
+    - -189.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-2
+    orientation: 270
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-3:
+    center:
+    - -64.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-3
+    orientation: 270
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-4:
+    center:
+    - 60.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-4
+    orientation: 270
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-5:
+    center:
+    - 185.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-5
+    orientation: 270
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-6:
+    center:
+    - 310.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-6
+    orientation: 270
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-7:
+    center:
+    - 435.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-7
+    orientation: 270
+    port_type: electrical
+    shear_angle: null
+    width: 75
   o1:
     center:
     - -17.0
@@ -32,7 +104,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -105,7 +177,7 @@ settings:
       gap: 0.2
       length_x: 4.0
       length_y: 0.6
-      port_orientation: 90
+      port_orientation: null
       radius: 10.0
       via_stack:
         function: via_stack
@@ -139,7 +211,7 @@ settings:
       gap: 0.2
       length_x: 4.0
       length_y: 0.6
-      port_orientation: 90
+      port_orientation: null
       radius: 10.0
       via_stack:
         function: via_stack
diff --git a/tests/test_components/test_pdk_settings_add_pads_rf_.yml b/tests/test_components/test_pdk_settings_add_pads_rf_.yml
index 7c0b7063..7f32e4a8 100644
--- a/tests/test_components/test_pdk_settings_add_pads_rf_.yml
+++ b/tests/test_components/test_pdk_settings_add_pads_rf_.yml
@@ -2,25 +2,97 @@ name: ring_single_heater_171f_ac60d9ba
 ports:
   elec-ring_single_heater_171f554b-1:
     center:
-    - 60.5
-    - 160.055
+    - 435.5
+    - 160.05
     layer:
     - 12
     - 0
     name: elec-ring_single_heater_171f554b-1
-    orientation: 270
+    orientation: 270.0
     port_type: electrical
     shear_angle: null
     width: 75
   elec-ring_single_heater_171f554b-2:
     center:
-    - -64.5
-    - 160.055
+    - 310.5
+    - 160.05
     layer:
     - 12
     - 0
     name: elec-ring_single_heater_171f554b-2
-    orientation: 270
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-3:
+    center:
+    - 185.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-3
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-4:
+    center:
+    - 60.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-4
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-5:
+    center:
+    - -64.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-5
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-6:
+    center:
+    - -189.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-6
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-7:
+    center:
+    - -314.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-7
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 75
+  elec-ring_single_heater_171f554b-8:
+    center:
+    - -439.5
+    - 160.05
+    layer:
+    - 12
+    - 0
+    name: elec-ring_single_heater_171f554b-8
+    orientation: 270.0
     port_type: electrical
     shear_angle: null
     width: 75
@@ -32,7 +104,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -105,7 +177,7 @@ settings:
       gap: 0.2
       length_x: 4.0
       length_y: 0.6
-      port_orientation: 90
+      port_orientation: null
       radius: 10.0
       via_stack:
         function: via_stack
@@ -139,7 +211,7 @@ settings:
       gap: 0.2
       length_x: 4.0
       length_y: 0.6
-      port_orientation: 90
+      port_orientation: null
       radius: 10.0
       via_stack:
         function: via_stack
diff --git a/tests/test_components/test_pdk_settings_bend_.yml b/tests/test_components/test_pdk_settings_bend_.yml
index e22ee971..675ff83e 100644
--- a/tests/test_components/test_pdk_settings_bend_.yml
+++ b/tests/test_components/test_pdk_settings_bend_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 90
+    orientation: 90.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_bend_euler_.yml b/tests/test_components/test_pdk_settings_bend_euler_.yml
index c101a680..829f150c 100644
--- a/tests/test_components/test_pdk_settings_bend_euler_.yml
+++ b/tests/test_components/test_pdk_settings_bend_euler_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 90
+    orientation: 90.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_bend_s_.yml b/tests/test_components/test_pdk_settings_bend_s_.yml
index 6aa79100..023556e8 100644
--- a/tests/test_components/test_pdk_settings_bend_s_.yml
+++ b/tests/test_components/test_pdk_settings_bend_s_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_coupler_.yml b/tests/test_components/test_pdk_settings_coupler_.yml
index e22cf23c..bd2c1dd8 100644
--- a/tests/test_components/test_pdk_settings_coupler_.yml
+++ b/tests/test_components/test_pdk_settings_coupler_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_coupler_ring_.yml b/tests/test_components/test_pdk_settings_coupler_ring_.yml
index 285ff5da..116bc7fd 100644
--- a/tests/test_components/test_pdk_settings_coupler_ring_.yml
+++ b/tests/test_components/test_pdk_settings_coupler_ring_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 90
+    orientation: 90.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -32,7 +32,7 @@ ports:
     - 1
     - 0
     name: o3
-    orientation: 90
+    orientation: 90.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_dbg_.yml b/tests/test_components/test_pdk_settings_dbg_.yml
index 474d9f40..be594894 100644
--- a/tests/test_components/test_pdk_settings_dbg_.yml
+++ b/tests/test_components/test_pdk_settings_dbg_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_dbr_cavity_.yml b/tests/test_components/test_pdk_settings_dbr_cavity_.yml
index 68220f4a..e946e2c4 100644
--- a/tests/test_components/test_pdk_settings_dbr_cavity_.yml
+++ b/tests/test_components/test_pdk_settings_dbr_cavity_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_dbr_cavity_te_.yml b/tests/test_components/test_pdk_settings_dbr_cavity_te_.yml
index fb24ad33..887cf596 100644
--- a/tests/test_components/test_pdk_settings_dbr_cavity_te_.yml
+++ b/tests/test_components/test_pdk_settings_dbr_cavity_te_.yml
@@ -73,7 +73,7 @@ settings:
         settings:
           polarization: te
           taper_angle: 35
-      layer_label: TEXT
+      layer_label: LABEL
       select_ports:
         function: select_ports
         settings:
diff --git a/tests/test_components/test_pdk_settings_ebeam_adiabatic_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_adiabatic_te1550_.yml
index 4e933811..e2697596 100644
--- a/tests/test_components/test_pdk_settings_ebeam_adiabatic_te1550_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_adiabatic_te1550_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -32,7 +32,7 @@ ports:
     - 1
     - 0
     name: o3
-    orientation: 0
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -44,7 +44,7 @@ ports:
     - 1
     - 0
     name: o4
-    orientation: 0
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ebeam_bdc_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_bdc_te1550_.yml
index 7ed22a05..9303b83e 100644
--- a/tests/test_components/test_pdk_settings_ebeam_bdc_te1550_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_bdc_te1550_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -32,7 +32,7 @@ ports:
     - 1
     - 0
     name: o3
-    orientation: 0
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -44,7 +44,7 @@ ports:
     - 1
     - 0
     name: o4
-    orientation: 0
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ebeam_crossing4_.yml b/tests/test_components/test_pdk_settings_ebeam_crossing4_.yml
index 1ea02118..c0e9a864 100644
--- a/tests/test_components/test_pdk_settings_ebeam_crossing4_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_crossing4_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 90
+    orientation: 90.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -32,7 +32,7 @@ ports:
     - 1
     - 0
     name: o3
-    orientation: 0
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -44,7 +44,7 @@ ports:
     - 1
     - 0
     name: o4
-    orientation: 270
+    orientation: 270.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ebeam_crossing4_2ports_.yml b/tests/test_components/test_pdk_settings_ebeam_crossing4_2ports_.yml
index a29a6daf..aa988784 100644
--- a/tests/test_components/test_pdk_settings_ebeam_crossing4_2ports_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_crossing4_2ports_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ebeam_dc_halfring_straight_.yml b/tests/test_components/test_pdk_settings_ebeam_dc_halfring_straight_.yml
index 48f56bc8..6a8a892c 100644
--- a/tests/test_components/test_pdk_settings_ebeam_dc_halfring_straight_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_dc_halfring_straight_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 90
+    orientation: 90.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -32,7 +32,7 @@ ports:
     - 1
     - 0
     name: o3
-    orientation: 90
+    orientation: 90.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ebeam_dc_te1550_.yml b/tests/test_components/test_pdk_settings_ebeam_dc_te1550_.yml
index ab74048b..4ee72f00 100644
--- a/tests/test_components/test_pdk_settings_ebeam_dc_te1550_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_dc_te1550_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ebeam_y_1550_.yml b/tests/test_components/test_pdk_settings_ebeam_y_1550_.yml
index 0aa5240e..ea29508b 100644
--- a/tests/test_components/test_pdk_settings_ebeam_y_1550_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_y_1550_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 0
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -32,7 +32,7 @@ ports:
     - 1
     - 0
     name: o3
-    orientation: 0
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ebeam_y_adiabatic_tapers_.yml b/tests/test_components/test_pdk_settings_ebeam_y_adiabatic_tapers_.yml
index 50858978..01624072 100644
--- a/tests/test_components/test_pdk_settings_ebeam_y_adiabatic_tapers_.yml
+++ b/tests/test_components/test_pdk_settings_ebeam_y_adiabatic_tapers_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_gc_te1310_.yml b/tests/test_components/test_pdk_settings_gc_te1310_.yml
index bd4f951a..b53b5021 100644
--- a/tests/test_components/test_pdk_settings_gc_te1310_.yml
+++ b/tests/test_components/test_pdk_settings_gc_te1310_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.35
diff --git a/tests/test_components/test_pdk_settings_gc_te1310_8deg_.yml b/tests/test_components/test_pdk_settings_gc_te1310_8deg_.yml
index 46d93d72..9cdfdd92 100644
--- a/tests/test_components/test_pdk_settings_gc_te1310_8deg_.yml
+++ b/tests/test_components/test_pdk_settings_gc_te1310_8deg_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.35
diff --git a/tests/test_components/test_pdk_settings_gc_te1550_.yml b/tests/test_components/test_pdk_settings_gc_te1550_.yml
index 3e32ce8a..fb865ed4 100644
--- a/tests/test_components/test_pdk_settings_gc_te1550_.yml
+++ b/tests/test_components/test_pdk_settings_gc_te1550_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_gc_te1550_90nmSlab_.yml b/tests/test_components/test_pdk_settings_gc_te1550_90nmSlab_.yml
index 80ab080a..af95c3ff 100644
--- a/tests/test_components/test_pdk_settings_gc_te1550_90nmSlab_.yml
+++ b/tests/test_components/test_pdk_settings_gc_te1550_90nmSlab_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml b/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml
index 1eee3bce..235a6f9f 100644
--- a/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml
+++ b/tests/test_components/test_pdk_settings_gc_te1550_broadband_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_gc_tm1550_.yml b/tests/test_components/test_pdk_settings_gc_tm1550_.yml
index 2d7ebc3b..abc3ce91 100644
--- a/tests/test_components/test_pdk_settings_gc_tm1550_.yml
+++ b/tests/test_components/test_pdk_settings_gc_tm1550_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_mmi1x2_.yml b/tests/test_components/test_pdk_settings_mmi1x2_.yml
index b3e02b05..a8155b18 100644
--- a/tests/test_components/test_pdk_settings_mmi1x2_.yml
+++ b/tests/test_components/test_pdk_settings_mmi1x2_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -55,6 +55,8 @@ settings:
     gap_mmi: 0.25
     length_mmi: 5.5
     length_taper: 10.0
+    straight:
+      function: straight
     taper:
       function: taper
     width: null
@@ -76,6 +78,8 @@ settings:
     gap_mmi: 0.25
     length_mmi: 5.5
     length_taper: 10.0
+    straight:
+      function: straight
     taper:
       function: taper
     width: null
diff --git a/tests/test_components/test_pdk_settings_mzi_.yml b/tests/test_components/test_pdk_settings_mzi_.yml
index 88aa2867..daa9b632 100644
--- a/tests/test_components/test_pdk_settings_mzi_.yml
+++ b/tests/test_components/test_pdk_settings_mzi_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_mzi_heater_.yml b/tests/test_components/test_pdk_settings_mzi_heater_.yml
index 652c22db..2c90ec5b 100644
--- a/tests/test_components/test_pdk_settings_mzi_heater_.yml
+++ b/tests/test_components/test_pdk_settings_mzi_heater_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -24,30 +24,102 @@ ports:
     port_type: optical
     shear_angle: null
     width: 0.5
-  top_e1:
+  top_l_e1:
     center:
     - 12.395
     - 24.75
     layer:
     - 12
     - 0
-    name: top_e1
-    orientation: 180
+    name: top_l_e1
+    orientation: 180.0
     port_type: electrical
     shear_angle: null
     width: 10
-  top_e2:
+  top_l_e2:
+    center:
+    - 17.395
+    - 29.75
+    layer:
+    - 12
+    - 0
+    name: top_l_e2
+    orientation: 90.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  top_l_e3:
+    center:
+    - 22.395
+    - 24.75
+    layer:
+    - 12
+    - 0
+    name: top_l_e3
+    orientation: 0.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  top_l_e4:
+    center:
+    - 17.395
+    - 19.75
+    layer:
+    - 12
+    - 0
+    name: top_l_e4
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  top_r_e1:
+    center:
+    - 232.405
+    - 24.75
+    layer:
+    - 12
+    - 0
+    name: top_r_e1
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  top_r_e2:
+    center:
+    - 237.405
+    - 29.75
+    layer:
+    - 12
+    - 0
+    name: top_r_e2
+    orientation: 90.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  top_r_e3:
     center:
     - 242.405
     - 24.75
     layer:
     - 12
     - 0
-    name: top_e2
+    name: top_r_e3
     orientation: 0.0
     port_type: electrical
     shear_angle: null
     width: 10
+  top_r_e4:
+    center:
+    - 237.405
+    - 19.75
+    layer:
+    - 12
+    - 0
+    name: top_r_e4
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
 settings:
   changed:
     length_x: 200
diff --git a/tests/test_components/test_pdk_settings_ring_double_heater_.yml b/tests/test_components/test_pdk_settings_ring_double_heater_.yml
index 252a98dd..d72dea04 100644
--- a/tests/test_components/test_pdk_settings_ring_double_heater_.yml
+++ b/tests/test_components/test_pdk_settings_ring_double_heater_.yml
@@ -1,26 +1,50 @@
 name: ring_double_heater_171f554b
 ports:
-  e1:
+  l_e1:
+    center:
+    - -10.01
+    - 0.0
+    layer:
+    - 12
+    - 0
+    name: l_e1
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  l_e2:
     center:
     - -5.01
     - 5.0
     layer:
     - 12
     - 0
-    name: e1
-    orientation: 90
+    name: l_e2
+    orientation: 90.0
     port_type: electrical
     shear_angle: null
     width: 10
-  e2:
+  l_e3:
     center:
-    - 5.0
-    - 5.0
+    - -0.01
+    - 0.0
     layer:
     - 12
     - 0
-    name: e2
-    orientation: 90
+    name: l_e3
+    orientation: 0.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  l_e4:
+    center:
+    - -5.01
+    - -5.0
+    layer:
+    - 12
+    - 0
+    name: l_e4
+    orientation: 270.0
     port_type: electrical
     shear_angle: null
     width: 10
@@ -32,38 +56,38 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
   o2:
     center:
-    - -13.01
-    - 21.41
+    - 13.0
+    - 0.0
     layer:
     - 1
     - 0
     name: o2
-    orientation: 180
+    orientation: 0.0
     port_type: optical
     shear_angle: null
     width: 0.5
   o3:
     center:
-    - 13.0
+    - -13.01
     - 21.41
     layer:
     - 1
     - 0
     name: o3
-    orientation: 0.0
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
   o4:
     center:
     - 13.0
-    - 0.0
+    - 21.41
     layer:
     - 1
     - 0
@@ -72,6 +96,54 @@ ports:
     port_type: optical
     shear_angle: null
     width: 0.5
+  r_e1:
+    center:
+    - 0.0
+    - 0.0
+    layer:
+    - 12
+    - 0
+    name: r_e1
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  r_e2:
+    center:
+    - 5.0
+    - 5.0
+    layer:
+    - 12
+    - 0
+    name: r_e2
+    orientation: 90.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  r_e3:
+    center:
+    - 10.0
+    - 0.0
+    layer:
+    - 12
+    - 0
+    name: r_e3
+    orientation: 0.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  r_e4:
+    center:
+    - 5.0
+    - -5.0
+    layer:
+    - 12
+    - 0
+    name: r_e4
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
 settings:
   changed:
     via_stack:
@@ -94,13 +166,14 @@ settings:
       function: bend_euler
     coupler_ring:
       function: coupler_ring
+    coupler_ring_top: null
     cross_section: strip
     cross_section_heater: heater_metal
     cross_section_waveguide_heater: strip_heater_metal
     gap: 0.2
     length_x: 0.01
     length_y: 0.01
-    port_orientation: 90
+    port_orientation: null
     radius: 10.0
     straight:
       function: straight
@@ -131,13 +204,14 @@ settings:
       function: bend_euler
     coupler_ring:
       function: coupler_ring
+    coupler_ring_top: null
     cross_section: strip
     cross_section_heater: heater_metal
     cross_section_waveguide_heater: strip_heater_metal
     gap: 0.2
     length_x: 0.01
     length_y: 0.01
-    port_orientation: 90
+    port_orientation: null
     radius: 10.0
     straight:
       function: straight
diff --git a/tests/test_components/test_pdk_settings_ring_single_.yml b/tests/test_components/test_pdk_settings_ring_single_.yml
index 331c9f7f..d74a67bd 100644
--- a/tests/test_components/test_pdk_settings_ring_single_.yml
+++ b/tests/test_components/test_pdk_settings_ring_single_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_ring_single_heater_.yml b/tests/test_components/test_pdk_settings_ring_single_heater_.yml
index b9c1e7c9..25465f3f 100644
--- a/tests/test_components/test_pdk_settings_ring_single_heater_.yml
+++ b/tests/test_components/test_pdk_settings_ring_single_heater_.yml
@@ -1,26 +1,50 @@
 name: ring_single_heater_171f554b
 ports:
-  e1:
+  l_e1:
+    center:
+    - -14.0
+    - 0.0
+    layer:
+    - 12
+    - 0
+    name: l_e1
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  l_e2:
     center:
     - -9.0
     - 5.0
     layer:
     - 12
     - 0
-    name: e1
-    orientation: 90
+    name: l_e2
+    orientation: 90.0
     port_type: electrical
     shear_angle: null
     width: 10
-  e2:
+  l_e3:
     center:
-    - 5.0
-    - 5.0
+    - -4.0
+    - 0.0
+    layer:
+    - 12
+    - 0
+    name: l_e3
+    orientation: 0.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  l_e4:
+    center:
+    - -9.0
+    - -5.0
     layer:
     - 12
     - 0
-    name: e2
-    orientation: 90
+    name: l_e4
+    orientation: 270.0
     port_type: electrical
     shear_angle: null
     width: 10
@@ -32,7 +56,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -48,6 +72,54 @@ ports:
     port_type: optical
     shear_angle: null
     width: 0.5
+  r_e1:
+    center:
+    - 0.0
+    - 0.0
+    layer:
+    - 12
+    - 0
+    name: r_e1
+    orientation: 180.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  r_e2:
+    center:
+    - 5.0
+    - 5.0
+    layer:
+    - 12
+    - 0
+    name: r_e2
+    orientation: 90.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  r_e3:
+    center:
+    - 10.0
+    - 0.0
+    layer:
+    - 12
+    - 0
+    name: r_e3
+    orientation: 0.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
+  r_e4:
+    center:
+    - 5.0
+    - -5.0
+    layer:
+    - 12
+    - 0
+    name: r_e4
+    orientation: 270.0
+    port_type: electrical
+    shear_angle: null
+    width: 10
 settings:
   changed:
     via_stack:
@@ -75,7 +147,7 @@ settings:
     gap: 0.2
     length_x: 4.0
     length_y: 0.6
-    port_orientation: 90
+    port_orientation: null
     radius: 10.0
     via_stack:
       function: via_stack
@@ -109,7 +181,7 @@ settings:
     gap: 0.2
     length_x: 4.0
     length_y: 0.6
-    port_orientation: 90
+    port_orientation: null
     radius: 10.0
     via_stack:
       function: via_stack
diff --git a/tests/test_components/test_pdk_settings_ring_with_crossing_.yml b/tests/test_components/test_pdk_settings_ring_with_crossing_.yml
index 34f7fe3b..5fc58117 100644
--- a/tests/test_components/test_pdk_settings_ring_with_crossing_.yml
+++ b/tests/test_components/test_pdk_settings_ring_with_crossing_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_spiral_.yml b/tests/test_components/test_pdk_settings_spiral_.yml
index c054a327..5b25b27f 100644
--- a/tests/test_components/test_pdk_settings_spiral_.yml
+++ b/tests/test_components/test_pdk_settings_spiral_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 270
+    orientation: 270.0
     port_type: optical
     shear_angle: null
     width: 0.5
@@ -20,7 +20,7 @@ ports:
     - 1
     - 0
     name: o2
-    orientation: 270
+    orientation: 270.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_straight_.yml b/tests/test_components/test_pdk_settings_straight_.yml
index 6f1909f6..1acbea1e 100644
--- a/tests/test_components/test_pdk_settings_straight_.yml
+++ b/tests/test_components/test_pdk_settings_straight_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_straight_one_pin_.yml b/tests/test_components/test_pdk_settings_straight_one_pin_.yml
index bee2bf90..3a757b80 100644
--- a/tests/test_components/test_pdk_settings_straight_one_pin_.yml
+++ b/tests/test_components/test_pdk_settings_straight_one_pin_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_terminator_short_.yml b/tests/test_components/test_pdk_settings_terminator_short_.yml
index fda2951f..f8175df8 100644
--- a/tests/test_components/test_pdk_settings_terminator_short_.yml
+++ b/tests/test_components/test_pdk_settings_terminator_short_.yml
@@ -8,7 +8,7 @@ ports:
     - 1
     - 0
     name: o1
-    orientation: 180
+    orientation: 180.0
     port_type: optical
     shear_angle: null
     width: 0.5
diff --git a/tests/test_components/test_pdk_settings_via_stack_heater_mtop_.yml b/tests/test_components/test_pdk_settings_via_stack_heater_mtop_.yml
index 828506da..98846dea 100644
--- a/tests/test_components/test_pdk_settings_via_stack_heater_mtop_.yml
+++ b/tests/test_components/test_pdk_settings_via_stack_heater_mtop_.yml
@@ -8,7 +8,7 @@ ports:
     - 12
     - 0
     name: e1
-    orientation: 180
+    orientation: 180.0
     port_type: electrical
     shear_angle: null
     width: 10
@@ -20,7 +20,7 @@ ports:
     - 12
     - 0
     name: e2
-    orientation: 90
+    orientation: 90.0
     port_type: electrical
     shear_angle: null
     width: 10
@@ -44,7 +44,7 @@ ports:
     - 12
     - 0
     name: e4
-    orientation: 270
+    orientation: 270.0
     port_type: electrical
     shear_angle: null
     width: 10
diff --git a/ubcpdk/samples/ubc_joaquin_matres1.py b/ubcpdk/samples/ubc_joaquin_matres1.py
index c195d618..c495081b 100644
--- a/ubcpdk/samples/ubc_joaquin_matres1.py
+++ b/ubcpdk/samples/ubc_joaquin_matres1.py
@@ -177,9 +177,9 @@ def test_mask7():
 if __name__ == "__main__":
     # gf.clear_cache()
     # m, tm = test_mask1()  # dbr and mzi
-    m, tm = test_mask2()  # spirals
+    # m, tm = test_mask2()  # spirals
     # m, tm = test_mask3()  # coupler and crossing
-    # m, tm = test_mask4()  # heated mzis
+    m, tm = test_mask4()  # heated mzis
     # m, tm = test_mask5()  # heated rings
     # m, tm = test_mask6()  # 1x2 mmis
     # m, tm = test_mask7()  # 2x2mmis