diff --git a/ttcn3/S1AP_TCFunctions.ttcn b/ttcn3/S1AP_TCFunctions.ttcn
index b606c19..e4d85e4 100644
--- a/ttcn3/S1AP_TCFunctions.ttcn
+++ b/ttcn3/S1AP_TCFunctions.ttcn
@@ -43,39 +43,55 @@ module S1AP_TCFunctions {
                 f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                 log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                 
-                f_send_S1AP_initiatingMessage(
-                    m_initiatingMessage_E_RABSetup(
-                    {
-                        m_E_RAB_IE_MME(1),
-                        m_E_RAB_IE_ENB(1),
-                        m_E_RAB_IE_ERAB(
-                        {
-                            m_E_RABToBeSetupItemBearerSUReq
-                            (
-                                -,
-                                m_e_RABlevelQoSParameters
-                                (5)
-                            )
-                        }
-                        )
-                    }
-                    )
-                );
-                
-                f_recv_S1AP_successfulOutcome(
-                    mw_successfulOutcome_E_RABSetupResponse(
+//                f_send_S1AP_initiatingMessage(
+//                    m_E_RABSetupRequest(
+//                    {
+//                        m_MME_UE_S1AP_ID(vc_MME_UE_ID),
+//                        m_ENB_UE_S1AP_ID(vc_ENB_UE_ID),
+//                        m_E_RABToBeSetupList(
+//                        {
+//                            m_E_RABToBeSetupItemBearerSUReq
+//                            (
+//                                -,
+//                                m_e_RABlevelQoSParameters
+//                                (5)
+//                            )
+//                        }
+//                        )
+//                    }
+//                    )
+//                );
+                f_send_E_RABSetupRequest(m_E_RABSetupReqIEs(
+                    vc_MME_UE_ID,
+                    vc_ENB_UE_ID,
+                    {m_E_RABToBeSetupItemBearerSUReq (
                         -,
-                        {
-                            mw_E_RAB_IE_MME(1),
-                            mw_E_RAB_IE_ENB(1),
-                            mw_E_RAB_IE_ERAB(
-                            {
-                                mw_E_RABSetupItemBearerSURes
-                            }
-                            )
-                        }
-                    )
-                );
+                        m_e_RABlevelQoSParameters
+                        (5)
+                    )}
+                ));
+
+                f_recv_E_RABSetupResponse(mw_E_RABSetupResIEs(
+                    vc_MME_UE_ID,
+                    vc_ENB_UE_ID,
+                    {
+                        mw_E_RABSetupItemBearerSURes
+                    }
+                ));
+                
+//                f_recv_S1AP_successfulOutcome(
+//                    mw_E_RABSetupResponse(
+//                        {
+//                            mw_MME_UE_S1AP_ID(vc_MME_UE_ID,ignore),
+//                            mw_ENB_UE_S1AP_ID(vc_ENB_UE_ID,ignore),
+//                            mw_E_RABSetupList(
+//                            {
+//                                mw_E_RABSetupItemBearerSURes
+//                            }
+//                            )
+//                        }
+//                    )
+//                );
                 
                 f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict()); 
                 
@@ -93,50 +109,79 @@ module S1AP_TCFunctions {
                 f_selfOrClientSyncAndVerdict(c_prDone, f_getVerdict()); 
                 log("*** " & __SCOPE__ & ": INFO: Preamble done. ***");
                 
-                f_send_S1AP_initiatingMessage(
-                    m_initiatingMessage_E_RABSetup(
+
+                f_send_E_RABSetupRequest(m_E_RABSetupReqIEs(
+                    vc_MME_UE_ID,
+                    vc_ENB_UE_ID,
                     {
-                         m_E_RAB_IE_MME(1),
-                         m_E_RAB_IE_ENB(1),
-                         m_E_RAB_IE_ERAB(
-                         {
-                             m_E_RABToBeSetupItemBearerSUReq(1),
-                             m_E_RABToBeSetupItemBearerSUReq(
-                                2,
-                                m_e_RABlevelQoSParameters
-                                (255)
-                             )
-                         }
+                         m_E_RABToBeSetupItemBearerSUReq(1),
+                         m_E_RABToBeSetupItemBearerSUReq(
+                            2,
+                            m_e_RABlevelQoSParameters
+                            (255)
                          )
                      }
-                     )
-                     
-                );
+                ));
                 
-                f_recv_S1AP_successfulOutcome(
-                    mw_successfulOutcome_E_RABSetupResponse(
-                        -,
-                        {
-                            mw_E_RAB_IE_MME(1),
-                            mw_E_RAB_IE_ENB(1),
-                            mw_E_RAB_IE_ERAB(
+//                f_send_S1AP_initiatingMessage(
+//                    m_E_RABSetupRequest(
+//                    {
+//                         m_MME_UE_S1AP_ID(vc_MME_UE_ID),
+//                         m_ENB_UE_S1AP_ID(vc_ENB_UE_ID),
+//                         m_E_RABToBeSetupList(
+//                         {
+//                             m_E_RABToBeSetupItemBearerSUReq(1),
+//                             m_E_RABToBeSetupItemBearerSUReq(
+//                                2,
+//                                m_e_RABlevelQoSParameters
+//                                (255)
+//                             )
+//                         }
+//                         )
+//                     }
+//                     )
+//                     
+//                );
+
+                f_recv_E_RABSetupResponse(mw_E_RABSetupResIEs_FailedToSetupList(
+                    vc_MME_UE_ID,
+                    vc_ENB_UE_ID,
+                    {
+                          mw_E_RABSetupItemBearerSURes(1)
+                    },
+                    {
+                        mw_E_RABItem(
+                            2,
                             {
-                                  mw_E_RABSetupItemBearerSURes(1)
+                                radioNetwork :=not_supported_QCI_value
                             }
-                            ),
-                            mw_E_RAB_IE_fSUL(
-                            {
-                                mw_E_RABItem(
-                                    2,
-                                    {
-                                        radioNetwork :=not_supported_QCI_value
-                                    }
-                                )
-                            }
-                            )
-                        }
-                    )
-                );
+                        )
+                    }
+                ));
+                
+//                f_recv_S1AP_successfulOutcome(
+//                    mw_E_RABSetupResponse(
+//                        {
+//                            mw_MME_UE_S1AP_ID(vc_MME_UE_ID,ignore),
+//                            mw_ENB_UE_S1AP_ID(vc_ENB_UE_ID,ignore),
+//                            mw_E_RABSetupList(
+//                            {
+//                                  mw_E_RABSetupItemBearerSURes(1)
+//                            }
+//                            ),
+//                            mw_E_RABFailedToSetupList(
+//                            {
+//                                mw_E_RABItem(
+//                                    2,
+//                                    {
+//                                        radioNetwork :=not_supported_QCI_value
+//                                    }
+//                                )
+//                            }
+//                            )
+//                        }
+//                    )
+//                );
                 
                 f_selfOrClientSyncAndVerdict(c_tbDone, f_getVerdict());