diff --git a/OneM2M_PermutationFunctions.ttcn b/OneM2M_PermutationFunctions.ttcn
index 889883727496d9a1f7f089e2f708f4b0634789ee..7aa1ea57a0e3223a0216039875029afb15e5f93c 100644
--- a/OneM2M_PermutationFunctions.ttcn
+++ b/OneM2M_PermutationFunctions.ttcn
@@ -7047,7 +7047,7 @@ module OneM2M_PermutationFunctions {
 					f_cseSimu_checkComponentDoneAndGetVerdict(vc_ae1);
 
 					v_latestResourceIndex := f_getLatestResourceIndex(vc_ae1);
-					p_updateRequestAnnc.to_ := f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1);
+					//p_updateRequestAnnc.to_ := f_getLocalResourceAddress(lengthof(vc_localResourcesList)-1);
 
 					// Test Body
 					vc_ae1.start(f_cse_updateResource(p_resourceType, v_latestResourceIndex, p_requestUpdatePrimitive));
@@ -7058,10 +7058,8 @@ module OneM2M_PermutationFunctions {
 							tc_ac.stop;
 							setverdict(pass, __SCOPE__ & ":INFO: Announcement received");
 
-							v_responsePrimitive := valueof(m_responsePrimitive(int2004,v_request.primitive.requestPrimitive.requestIdentifier));
-							v_responsePrimitive.from_ := vc_cseSimuDesc.cseId;
-							v_responsePrimitive.to_ := v_request.primitive.requestPrimitive.from_;
-							f_send(e_mccPortIn, m_response(v_responsePrimitive));			
+							f_processUpdateRequestPrimitive(v_request.primitive.requestPrimitive, -, lengthof(vc_localResourcesList)-1);
+							f_send(e_mccPortIn, m_response(vc_response.primitive.responsePrimitive));
 						}
 						[] tc_ac.timeout {
 							setverdict(fail, __SCOPE__ & ":ERROR:  No announcement received");