diff --git a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
index 0813474..fe1b0f0 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
@@ -42,28 +42,21 @@ public class HL7Sender {
         Patient patient = fall.getPatient ();
         ADT_A01 adt = new ADT_A01 ();
 
-        //default MSH Values (Sets Segments: 1,2,7,9
+        //default MSH Values (Sets Segments: 1,2,7,9,11
         adt.initQuickstart ("ADT", "A01", "P");
 
         //MSH Segment:
         MSH mshSegment = adt.getMSH();
-        mshSegment.getMsh3_SendingApplication ().getNamespaceID ().setValue ( "KISGruppe6" );
-        mshSegment.getMsh5_ReceivingApplication ().getNamespaceID ().setValue("OPS Gruppe von Maurice und Torben");
-        mshSegment.getMsh12_VersionID ().getVersionID ().setValue ( "2.2" );
-        mshSegment.getMsh15_AcceptAcknowledgmentType ().setValue ( "AL" );
-        //Security?
-        //Message Control ID?
-        //Processing ID?
-        //Sequence Number ?
-        //Contituation Pointer ?
-        //Cointry Code
-        //Character Set
-        //Principal Language of Message
+        mshSegment.getMsh3_SendingApplication ().getNamespaceID ().parse ( "KISGruppe6" );
+        mshSegment.getMsh5_ReceivingApplication ().getNamespaceID ().parse("OPS Gruppe von Maurice und Torben");
+        mshSegment.getMsh12_VersionID ().getVersionID ().parse ( "2.51" );
+        mshSegment.getMsh15_AcceptAcknowledgmentType ().parse ( "AL" );
+        //TODO check ob segment 10 gesetzt wurde
 
         //EVN Segment:
         EVN evnSegment = adt.getEVN ();
-        evnSegment.getEvn1_EventTypeCode ().setValue ("A01");
-        evnSegment.getEvn4_EventReasonCode ().setValue ( "01" );
+        evnSegment.getEvn1_EventTypeCode ().parse("A01");
+        evnSegment.getEvn4_EventReasonCode ().parse ( "01" );
         //Operator ID
         //Event occured