diff --git a/asciidoc/volume2/gateways/tf2-ch-b-gateway-obx18-mapping.adoc b/asciidoc/volume2/gateways/tf2-ch-b-gateway-obx18-mapping.adoc
index cb9b1bf..b8694df 100644
--- a/asciidoc/volume2/gateways/tf2-ch-b-gateway-obx18-mapping.adoc
+++ b/asciidoc/volume2/gateways/tf2-ch-b-gateway-obx18-mapping.adoc
@@ -1,31 +1,10 @@
 [#ref_gateway_obx18_mapping]
 ===== OBX-18 Equipment Instance Identifier
 
-[%noheader]
-[%autowidth]
-[cols="1"]
-|===
-a| *SDPi Supplement Version Note*:  The UDI is not available for all devices and alternatives for uniquely identifying a device shall be defined.
-The SDC BICEPS standards provides the *pm:ProductionSpecification* on the MDS and VMD level which is a list of coded product specifications such as serial number, model, product number, manufacture, etc.
-
-Another issue is that the field "Universal ID Type" of the HL7 EI date type is bound to HL7 table 0301 which does not contain a "UDI" id type.
-
-*REVIEWER QUESTION*:  Please provide feedback on the following questions ...
-
-. Are there any general rules that can be applied to generate a unique deivce id? Or are there any information each device has to provide to generate a unique device id?
-
-. Which unique VMD identifier are provided by devices?
-
-. Which code should be used in the case of an UDI?
-
-|===
-
-
-
 .R8117
 [sdpi_requirement#r8117,sdpi_req_level=shall,sdpi_max_occurrence=1]
 ****
-A <<actor_somds_dec_gateway>> / <<actor_somds_acm_gateway>> shall set the OBX-18 field to the equipment (or device) identifier on the MDS level and/or the measurement module identifier of the equipment on the VMD level.
+A <<actor_somds_dec_gateway>> / <<actor_somds_acm_gateway>> shall set the OBX-18 field to the equipment (or device) identifier on the MDS level and/or the measurement module identifier of the equipment on the VMD level as defined in section <<vol3_clause_equipment_identifier>>.
 
 
 
@@ -45,24 +24,23 @@ NOTE: <<ref_tbl_dec_obx18_vmd_mapping>> defines the mapping of the <<acronym_mdi
 
 |OBX-18/EI-1
 |Entity Identifier
-|pm:Mds
-/pm:MetaData+++<wbr/>+++/pm:Udi+++<wbr/>+++/pm:DeviceIdentifier
-|
+|pm:Mds/ext:Extension+++<wbr/>+++/sdpi:EquipmentIdentifier
+|Universal Unique Identifier (UUID) without the prefix *"urn:uuid:"*.
 
 |OBX-18/EI-2
 |Namespace ID
-|pm:Mds+++<wbr/>+++/pm:MetaData+++<wbr/>+++/pm:Udi+++<wbr/>+++/pm:Issuer+++<wbr/>+++/@Root
 |
+|This field is left empty.
 
 |OBX-18/EI-3
 |Universal ID
-|pm:Mds+++<wbr/>+++/pm:MetaData+++<wbr/>+++/pm:Udi+++<wbr/>+++/pm:DeviceIdentifier
-|
+|pm:Mds/ext:Extension+++<wbr/>+++/sdpi:EquipmentIdentifier
+|Universal Unique Identifier (UUID) without the prefix *"urn:uuid:"*.
 
 |OBX-18/EI-4
 |Universal ID Type
 |
-|Set to *""L"*
+|Set to *"UUID"*
 
 |===
 
@@ -73,22 +51,22 @@ NOTE: <<ref_tbl_dec_obx18_vmd_mapping>> defines the mapping of the <<acronym_mdi
 
 |OBX-18/EI-1
 |Entity Identifier
-|
-|
+|pm:Vmd/ext:Extension+++<wbr/>+++/sdpi:EquipmentIdentifier
+|Universal Unique Identifier (UUID) without the prefix *"urn:uuid:"*.
 
 |OBX-18/EI-2
 |Namespace ID
 |
-|
+|This field is left empty.
 
 |OBX-18/EI-3
 |Universal ID
-|
-|
+|pm:Vmd/ext:Extension+++<wbr/>+++/sdpi:EquipmentIdentifier
+|Universal Unique Identifier (UUID) without the prefix *"urn:uuid:"*.
 
 |OBX-18/EI-4
 |Universal ID Type
 |
-|
+|Set to *"UUID"*
 
 |===