diff --git a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
index 7a7e7008654bc461d6c2fbc6dafc76a9c1bcbcea..12945ab6438383bd9cec22c1d32d1d828831e4dd 100644
--- a/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
+++ b/SOL002/VNFPerformanceManagement-API/ApiVersion.robot
@@ -11,7 +11,7 @@ POST API Version - Method not implemented
     ...    Test title: POST API version - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -23,7 +23,7 @@ GET API Version
     ...    Test title: GET API Version
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -36,7 +36,7 @@ PUT API Version - Method not implemented
     ...    Test title: PUT API Version - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -48,7 +48,7 @@ PATCH API Version - Method not implemented
     ...    Test title: PATCH API Version - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -60,7 +60,7 @@ DELETE API Version - Method not implemented
     ...    Test title: DELETE API Version - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -72,7 +72,7 @@ POST API Version with apiMajorVerion - Method not implemented
     ...    Test title: POST API version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that POST method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.1 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none    
@@ -84,7 +84,7 @@ GET API Version with apiMajorVerion
     ...    Test title: GET API Version with apiMajorVerion
     ...    Test objective: The objective is to test that GET method successfully return ApiVersionInformation
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.2 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -97,7 +97,7 @@ PUT API Version with apiMajorVerion - Method not implemented
     ...    Test title: PUT API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.3 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -109,7 +109,7 @@ PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test title: PATCH API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.4 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -121,7 +121,7 @@ DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test title: DELETE API Version with apiMajorVerion - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not implemented
     ...    Pre-conditions: none
-    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.7.1
+    ...    Reference: Clause 9.3.3.3.5 - ETSI GS NFV-SOL 013 v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
index ca839fbe23f2cd01ff4e23f316d2372c1ba5cf6e..ef1fdb1c23596cdbf09f5771c74d9c1b9902afa7 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualPmJob.robot
@@ -5,6 +5,7 @@ Library     JSONLibrary
 Library     REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library     OperatingSystem
 Library     DependencyLibrary
+Library           String
 
 *** Test Cases ***
 GET individual VNF Performance Job
@@ -12,7 +13,7 @@ GET individual VNF Performance Job
     ...    Test title: Get individual VNF Performance Job
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance monitoring job and perform a JSON schema and content validation of the collected job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -26,7 +27,7 @@ GET individual VNF Performance Job with invalid resource identifier
     ...    Test title: Get individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +40,7 @@ DELETE Individual VNF Performance Job
     ...    Test title: Delete Individual VNF Performance Job
     ...    Test objective: The objective is to test the deletion of an individual VNF performance monitoring job
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is no more available in the VNFM    
@@ -52,7 +53,7 @@ DELETE Individual VNF Performance Job with invalid resource identifier
     ...    Test title: Delete individual VNF Performance Job with invalid resource identifier
     ...    Test objective: The objective is to test that the deletion of an individual VNF performance monitoring job fails when using an invalid resource identifier, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.5 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +66,7 @@ POST Individual VNF Performance Job - Method not implemented
     ...    Test title: POST Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -77,7 +78,7 @@ PUT Individual VNF Performance Job - Method not implemented
     ...    Test title: PUT Individual VNF Performance Job - method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance Monitoring Job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.3 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -89,7 +90,7 @@ PATCH Individual VNF Performance Job
     ...    Test title: PATCH Individual VNF Performance Job
     ...    Test objective: The objective is to test that PATCH method allows to modify an exsisting individual PM job resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -100,17 +101,30 @@ PATCH Individual VNF Performance Job
 PATCH Individual VNF Performance Job - Precondition failed
     [Documentation]    Test ID: 6.3.3.2.8
     ...    Test title: PATCH Individual VNF Performance Job - Precondition failed
-    ...    Test objective: The objective is to attempt to Modify an individual alarm resource, where the precondition was not met
+    ...    Test objective: The objective is to attempt to Modify an individual PM Job resource, where the precondition given in an HTTP request header is not fulfilled due to an ETag mismatch.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
-    Send Patch request for individual VNF Performance Job
+    Send Patch request for individual VNF Performance Job - ETag Mismatch
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is   ProblemDetails
     Check Postcondition VNF Performance Job is Unmodified (Implicit)
 
+PATCH Individual VNF Performance Job - UNPROCESSIBLE ENTITY
+    [Documentation]    Test ID: 6.3.3.2.9
+    ...    Test title: PATCH Individual VNF Performance Job - UNPROCESSIBLE ENTITY
+    ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual PM job resource when the callback URI provided in the Request body is unreachable by the VNFM.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
+    ...    Reference: Clause 6.4.3.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM cannot reach the Notification endpoint.
+    ...    Post-Conditions: none
+    Send Patch request for individual VNF Performance Job with Unreachable Callback URI
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+
 *** Keywords ***
 GET individual VNF Performance Job
     Log    Trying to get a Pm Job present in the NFVO Catalogue
@@ -165,9 +179,32 @@ Send Put request for individual VNF Performance Job
     
 Send Patch request for individual VNF Performance Job    
     Set Headers  {"Accept":"${ACCEPT_JSON}"} 
-    Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/PMJobModification.json
+    ${body}=        Format String   ${template}    callback_uri=${new_callback_uri}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+    
+Send Patch request for individual VNF Performance Job - ETag Mismatch
+    log    Trying to perform a PATCH to modify individual PmJob using an invalid ETag
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Set Headers    {"If-Match": "${invalid_etag}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/PMJobModification.json
+    ${body}=        Format String   ${template}    callback_uri=${new_callback_uri}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+	
+Send Patch request for individual VNF Performance Job with Unreachable Callback URI    
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
-    ${body}=    Get File    jsons/PMJobModification.json
+    ${template}=    Get File    jsons/PMJobModification.json
+    ${body}=        Format String   ${template}    callback_uri=${unreachable_callback_uri}
     PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs/${pmJobId}     ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
index 38845b3bd2dc7f3e5f49c983e4de2d19a022107c..b45328fd1e7f7192dfe45ee0fde4ca55b12d62cb 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualReport.robot
@@ -10,7 +10,7 @@ Get Individual Performance Report
     ...    Test title: Get Individual Performance Report
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance report associated to a monitoring job and perform a JSON schema validation of the collected report data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -23,7 +23,7 @@ Get Individual Performance Report with invalid resource endpoint
     ...    Test title: Get Individual Performance Report with invalid resource endpoint
     ...    Test objective:  The objective is to test that the retrieval of an individual VNF performance report associated to a monitoring job fails when using an invalid resource endpoint 
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance reports are set for a monitoring job in the VNFM.
-    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -36,7 +36,7 @@ POST Individual Performance Report - Method not implemented
     ...    Test title: POST Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -48,7 +48,7 @@ PUT Individual Performance Report - Method not implemented
     ...    Test title: PUT Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.3 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -60,7 +60,7 @@ PATCH Individual Performance Report - Method not implemented
     ...    Test title: PATCH Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -72,7 +72,7 @@ DELETE Individual Performance Report - Method not implemented
     ...    Test title: DELETE Individual Performance Report - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to delete an existing VNF performance report within a monitoring job
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.4.3.5 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
diff --git a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
index cab48da3d3caf3ed0d297de33f4be5777c10983e..646e853c2a6906ff7fc82ce2c20be897f8c439aa 100644
--- a/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
+++ b/SOL002/VNFPerformanceManagement-API/IndividualThreshold.robot
@@ -4,6 +4,7 @@ Resource          environment/variables.txt    # Generic Parameters
 Library           JSONLibrary
 Library           REST    ${VNFM_SCHEMA}://${VNFM_HOST}:${VNFM_PORT}    ssl_verify=false
 Library           OperatingSystem
+Library           String
 
 *** Test Cases ***
 GET Individual Threshold
@@ -11,7 +12,7 @@ GET Individual Threshold
     ...    Test title: GET Individual Threshold
     ...    Test objective: The objective is to test the retrieval of an individual VNF performance threshold and perform a JSON schema and content validation of the collected threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +26,7 @@ GET Individual Threshold with invalid resource identifier
     ...    Test title: GET Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test that the retrieval of an individual VNF performance threshold fails when using an invalid resource identifier
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -38,7 +39,7 @@ DELETE Individual Threshold
     ...    Test title: DELETE Individual Threshold
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not available anymore in the VNFM    
@@ -51,7 +52,7 @@ DELETE Individual Threshold with invalid resource identifier
     ...    Test title: DELETE Individual Threshold with invalid resource identifier
     ...    Test objective: The objective is to test the deletion of an individual VNF performance threshold
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.5 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -64,7 +65,7 @@ POST Individual Threshold - Method not implemented
     ...    Test title: POST Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that POST method is not allowed to create a new VNF Performance Threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not created on the VNFM
@@ -76,7 +77,7 @@ PUT Individual Threshold - Method not implemented
     ...    Test title: PUT Individual Threshold - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to update an existing VNF Performance threshold
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.3 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -88,7 +89,7 @@ PATCH Individual Threshold
     ...    Test title: PATCH Individual Threshold 
     ...    Test objective: The objective is to test that PATCH method allows to modify an Individual threshold resource.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
@@ -98,17 +99,31 @@ PATCH Individual Threshold
        
 PATCH Individual Threshold - Precondition failed
     [Documentation]    Test ID: 6.3.3.5.8
-    ...    Test title: PATCH Individual Threshold - Preconition failed
-    ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition was not met.
+    ...    Test title: PATCH Individual Threshold - Precondition failed
+    ...    Test objective: The objective is to attempt to modify an individual threshold resource, where the precondition given in an HTTP request header is not fulfilled due to an ETag mismatch.
     ...    Pre-conditions:  A VNF instance is instantiated. One or more VNF performance jobs are set in the VNFM.
-    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions:  The VNF Performance Job is not modified by the operation
-    Send Patch request for individual VNF Performance Threshold
+    Send Patch request for individual VNF Performance Threshold - ETag Mismatch
     Check HTTP Response Status Code Is    412
     Check HTTP Response Body Json Schema Is   ProblemDetails
     Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
+    
+PATCH Individual Threshold - Unprocessible Entity
+    [Documentation]    Test ID: 6.3.3.5.9
+    ...    Test title: PATCH Individual Threshold - Unprocessible Entity 
+    ...    Test objective: The objective is to test that PATCH method cannot modify an exsisting individual Threshold resource when the callback URI provided in the Request body is unreachable by the VNFM.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
+    ...    Reference: Clause 6.4.6.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM cannot reach the Notification endpoint.
+    ...    Post-Conditions: The VNF Performance Threshold is not modified by the operation
+    Send Patch request for individual VNF Performance Threshold with Unreachable Callback URI
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    Check Postcondition VNF Performance Threshold is Unmodified (Implicit)
 
 *** Keywords ***
 GET Individual VNF Performance Threshold
@@ -160,13 +175,40 @@ Send Put request for individual VNF Performance Threshold
     Set Suite Variable    ${response}    ${output}
 
 Send Patch request for individual VNF Performance Threshold
-    Log    Trying to PUT threshold
-    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    ${origOutput}=    Output    response
+    Set Suite Variable    ${origResponse}    ${origOutput}
+    ${template}=    Get File    jsons/ThresholdModification.json
+    ${body}=        Format String   ${template}     callback_uri=${new_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}     ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
+Send Patch request for individual VNF Performance Threshold - ETag Mismatch
+    log    Trying to perform a PATCH to modify individual Threshold using an invalid ETag
+    Set Headers  {"Accept":"${ACCEPT_JSON}"}  
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"}
+    Set Headers    {"If-Match": "${invalid_etag}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/ThresholdModification.json
+    ${body}=        Format String   ${template}     callback_uri=${new_callback_uri}:${callback_port}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}     ${body}
+    ${outputResponse}=    Output    response
+	Set Global Variable    ${response}    ${outputResponse} 
+
+Send Patch request for individual VNF Performance Threshold with Unreachable Callback URI    
+    Set Headers  {"Accept":"${ACCEPT_JSON}"} 
+    Set Headers  {"Content-Type": "${CONTENT_TYPE_PATCH}"} 
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     GET    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
     ${origOutput}=    Output    response
     Set Suite Variable    ${origResponse}    ${origOutput}
-    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}
+    ${template}=    Get File    jsons/ThresholdModification.json
+    ${body}=        Format String   ${template}    callback_uri=${unreachable_callback_uri}
+    PATCH    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds/${thresholdId}     ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
diff --git a/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot b/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
index 2d557051e46ab62efd224b801cdde84e1b202f47..ecd597582aefd785cac8ac7930c2c79b9e2e8d57 100644
--- a/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
+++ b/SOL002/VNFPerformanceManagement-API/NotificationEndpoint.robot
@@ -13,7 +13,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test that VNF Performance Information Availability Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -25,7 +25,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test that VNF Threshold Crossed Notification is delivered with success to the notification consumer
     ...    Pre-conditions: A VNF performance job is created, and a subscription for Threshold Crossed Notification is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_Notif_Endpoint
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -54,7 +54,7 @@ Post VNF Performance Information Availability Notification
     Set Headers  {"Content-Type": "${CONTENT_TYPE_JSON}"}
     Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
     ${template} =    Get File    jsons/PerformanceInformationAvaliableNotification.json
-    ${body}=        Format String   ${template}    objectInstanceId=${objectInstanceId} 
+    ${body}=        Format String   ${template}    objectInstanceId=${objectInstanceId}    pmJobId=${pmJobId} 
     Post    ${callbackResp}    ${body}
     ${outputResponse}=    Output    response
 	Set Global Variable    ${response}    ${outputResponse}	
diff --git a/SOL002/VNFPerformanceManagement-API/PMJobs.robot b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
index 4c976169a81beecb500c55e6bc6e740eb2ee56c3..0e1993f3d41bbfdebaf77598f96de39f207d49ef 100644
--- a/SOL002/VNFPerformanceManagement-API/PMJobs.robot
+++ b/SOL002/VNFPerformanceManagement-API/PMJobs.robot
@@ -12,7 +12,7 @@ GET all VNF Performance Monitoring Jobs
     ...    Test title: GET all VNF Performance Monitoring Jobs
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance monitoring jobs and perform a JSON schema and content validation of the collected jobs data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test title: GET all VNF Performance Monitoring Jobs with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs using attribute-based filter, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with all_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs all_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued all_fileds selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -53,7 +53,7 @@ GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_default attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -67,7 +67,7 @@ GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -81,7 +81,7 @@ GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs exclude_fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_fields selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: The VNFM supports the use of exclude_fields attribute selector
     ...    Post-Conditions: none
@@ -95,7 +95,7 @@ GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -108,7 +108,7 @@ GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test title: GET VNF Performance Monitoring Jobs with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance monitoring jobs fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -121,7 +121,7 @@ Create new VNF Performance Monitoring Job
     ...    Test title:  Create a new VNF Performance Monitoring Job
     ...    Test objective: The objective is to test the creation of a new VNF performance monitoring job and perform the JSON schema validation of the returned job data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Job is successfully created on the VNFM
@@ -135,7 +135,7 @@ PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PUT all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -147,7 +147,7 @@ PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: PATCH all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -159,7 +159,7 @@ DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test title: DELETE all VNF Performance Monitoring Jobs - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Monitoring Jobs
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.3 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VE
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -171,7 +171,7 @@ GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test title: GET VNF Performance Monitoring Jobs to get Paged Response
     ...    Test objective: The objective is to test the retrieval of VNF performance monitoring jobs to get Paged response.
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none   
@@ -184,7 +184,7 @@ GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test title: GET VNF Performance Monitoring Jobs for Bad Request Response too big
     ...    Test objective: The objective is to test that GET method fail retrieving status information about VNF Performance Monitoring when Response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -197,13 +197,27 @@ GET all VNF Performance Monitoring Jobs with exclude_default and fields attribut
     ...    Test title: GET all VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
     ...    Test objective: The objective is to test the retrieval of all VNF performance monitoring jobs with exclude_default and fields attribute selector, perform a JSON schema validation of the collected jobs data structure, and verify that the retrieved information matches the issued exclude_default selector
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
-    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 4.3.3.2.1, 6.4.2.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
     GET VNF Performance Monitoring Jobs with exclude_default and fields attribute selector
     Check HTTP Response Status Code Is    200
     Check HTTP Response Body Json Schema Is   PmJobs  
+    
+POST Create new VNF Performance Monitoring Job - UNPROCESSIBLE ENTITY
+    [Documentation]    Test ID: 6.3.3.1.16
+    ...    Test title:  POST Create a new VNF Performance Monitoring Job - UNPROCESSIBLE ENTITY
+    ...    Test objective: The objective is to test that the POST method cannot create a new VNF performance monitoring job when the callback URI provided in the Request body is unreachable by the VNFM.
+    ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance jobs are set in the VNF.
+    ...    Reference: Clause 6.4.2.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM cannot reach the Notification endpoint.
+    ...    Post-Conditions: none
+    Send Post Request Create new VNF Performance Monitoring Job with Unreachable Callback URI
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is   ProblemDetails
+
 *** Keywords ***
 GET all VNF Performance Monitoring Jobs
     Log    Trying to get all PM Jobs present in the VNFM
@@ -290,6 +304,17 @@ Send Post Request Create new VNF Performance Monitoring Job
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
 
+Send Post Request Create new VNF Performance Monitoring Job with Unreachable Callback URI
+    Log    Creating a new PM Job
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    ${template}=    Get File    jsons/CreatePmJobRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${unreachable_callback_uri}:${callback_port}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/pm_jobs    ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
+
 Send PUT Request for all VNF Performance Monitoring Jobs 
     Log    Trying to perform a PUT. This method should not be implemented
     Set Headers    {"Accept": "${ACCEPT_JSON}"}
diff --git a/SOL002/VNFPerformanceManagement-API/Thresholds.robot b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
index 474f0200265b64689accbfeb1179c85e720d9b1c..0360763014b871a8a539e6560344c57af81fcc21 100644
--- a/SOL002/VNFPerformanceManagement-API/Thresholds.robot
+++ b/SOL002/VNFPerformanceManagement-API/Thresholds.robot
@@ -12,7 +12,7 @@ GET All Performance Thresholds
     ...    Test title: GET All Performance Thresholds
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds and perform a JSON schema validation of the collected thresholds data structure
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -25,7 +25,7 @@ GET Performance Thresholds with attribute-based filter
     ...    Test title: GET Performance Thresholds with attribute-based filter
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds when using attribute-based filters, perform a JSON schema validation of the collected thresholds data structure, and verify that the retrieved information matches the issued attribute-based filter
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -39,7 +39,7 @@ GET Performance Thresholds with invalid attribute-based filter
     ...    Test title: GET Performance Thresholds with invalid attribute-based filter
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid attribute-based filter, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -52,7 +52,7 @@ GET Performance Thresholds with invalid resource endpoint
     ...    Test title: GET Performance Thresholds with invalid resource endpoint
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when using invalid resource endpoint, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -65,7 +65,7 @@ Create new Performance Threshold
     ...    Test title:  Create new Performance Threshold
     ...    Test objective: The objective is to test the creation of a new VNF performance threshold and perform the JSON schema validation of the returned threshold data structure
     ...    Pre-conditions: A VNF instance is instantiated.
-    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: The VNF Performance Threshold is successfully created on the VNFM
@@ -80,7 +80,7 @@ PUT Performance Thresholds - Method not implemented
     ...    Test title: PUT Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PUT method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.3 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -92,7 +92,7 @@ PATCH Performance Thresholds - Method not implemented
     ...    Test title: PATCH Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that PATCH method is not allowed to modify VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.4 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -104,7 +104,7 @@ DELETE Performance Thresholds - Method not implemented
     ...    Test title: DELETE Performance Thresholds - Method not implemented
     ...    Test objective: The objective is to test that DELETE method is not allowed to update VNF Performance Thresholds
     ...    Pre-conditions: none
-    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.5 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -116,7 +116,7 @@ GET Performance Thresholds with Paged Response
     ...    Test title: GET Performance Thresholds with Paged Response
     ...    Test objective: The objective is to test the retrieval of all the available VNF performance thresholds with Paged response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -129,7 +129,7 @@ GET Performance Thresholds for Bad Request Response too big
     ...    Test title: GET Performance Thresholds for Bad Request Response too big
     ...    Test objective: The objective is to test that the retrieval of VNF performance thresholds fails when response is too big, and perform the JSON schema validation of the failed operation HTTP response
     ...    Pre-conditions: A VNF instance is instantiated. One or more VNF performance thresholds are set in the VNFM.
-    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.5.3.2 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none
@@ -137,6 +137,19 @@ GET Performance Thresholds for Bad Request Response too big
     Check HTTP Response Status Code Is    400
     Check HTTP Response Body Json Schema Is   ProblemDetails
     
+POST Create new Performance Threshold - UNPROCESSIBLE ENTITY
+    [Documentation]    Test ID: 6.3.3.4.11
+    ...    Test title:  POST Create new Performance Threshold
+    ...    Test objective: The objective is to test that the POST method does not create a new VNF performance threshold when the callback URI provided in the Request body is unreachable by the VNFM.
+    ...    Pre-conditions: A VNF instance is instantiated.
+    ...    Reference: Clause 6.4.5.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
+    ...    Config ID: Config_prod_VNFM
+    ...    Applicability: The VNFM cannot reach the Notification endpoint.
+    ...    Post-Conditions: none
+    Send Post Request Create new Performance Threshold with Unreachable Callback URI
+    Check HTTP Response Status Code Is    422
+    Check HTTP Response Body Json Schema Is    ProblemDetails
+    
 *** Keywords ***
 GET all Performance Thresholds
     Log    Trying to get all thresholds present in the VNFM    
@@ -180,6 +193,17 @@ Send Post Request Create new Performance Threshold
     POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
     ${output}=    Output    response
     Set Suite Variable    ${response}    ${output}
+    
+Send Post Request Create new Performance Threshold with Unreachable Callback URI
+    Log    Creating a new THreshold
+    Run Keyword If    ${AUTH_USAGE} == 1    Set Headers    {"${AUTHORIZATION_HEADER}":"${AUTHORIZATION_TOKEN}"}
+    Set Headers    {"Accept": "${ACCEPT_JSON}"}
+    Set Headers    {"Content-Type": "${CONTENT_TYPE_JSON}"}
+    ${template}=    Get File    jsons/CreateThresholdRequest.json
+    ${body}=        Format String   ${template}     objectInstanceIds=${objectInstanceIds}    callback_uri=${unreachable_callback_uri}:${callback_port}
+    POST    ${apiRoot}/${apiName}/${apiMajorVersion}/thresholds    ${body}
+    ${output}=    Output    response
+    Set Suite Variable    ${response}    ${output}
 
 Send PUT Request for all Performance Thresholds
     Log    PUT THresholds
diff --git a/SOL002/VNFPerformanceManagement-API/environment/variables.txt b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
index c71b69f3269bf79c92c335386939e902d17d71dd..635725134d850f9fc25f55aee10a2a10a697a9e9 100644
--- a/SOL002/VNFPerformanceManagement-API/environment/variables.txt
+++ b/SOL002/VNFPerformanceManagement-API/environment/variables.txt
@@ -9,6 +9,7 @@ ${apiName}        vnfpm
 
 
 ${CONTENT_TYPE_JSON}    application/json
+${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}    application/json
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${FIELD_USAGE}    1
@@ -18,6 +19,8 @@ ${AUTH_USAGE}    1
 ${VNFM_DUPLICATION}    1
 ${VNFM_CHECKS_NOTIF_ENDPOINT}    1
 ${callback_uri}    http://localhost
+${new_callback_uri}    http://newcallbackuri-for-PMJobModifications
+${unreachable_callback_uri}    http://not-reachable-uri
 ${callback_port}    9091
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_error}    /endpoint_404
@@ -30,7 +33,7 @@ ${objectInstanceIds}    1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
 
 ${subscribe}    /subscribe
 
-
+${invalid_etag}    some-invalid-eTag-value 
 
 ${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
 ${erroneousPmJobId}    erroneousPmJobId
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json b/SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json
index 3aeb5f91c199064546693cd63b88c434584c3d92..a3fd111bf56286a602429589a2809e8a47cc7ee9 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/PMJobModification.json
@@ -1,3 +1,3 @@
-{
-	"callbackUri":"127.0.0.1"
-}
\ No newline at end of file
+{{
+	"callbackUri":"{callback_uri}"
+}}
\ No newline at end of file
diff --git a/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json b/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
index 5ac84f0a452c13051b8c18fbbd8942876ee6e315..3269d35b6a8f3be2eefbbb7cd76b7210ab970ab8 100644
--- a/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
+++ b/SOL002/VNFPerformanceManagement-API/jsons/PerformanceInformationAvaliableNotification.json
@@ -2,6 +2,7 @@
 	"id":"",
 	"notificationType":"PerformanceInformationAvailableNotification",
 	"timeStamp":"",
+	"pmJobId": "{pmJobId}",
 	"objectType":"",
 	"objectInstanceId":"{objectInstanceId}",
 	"_links":{{
diff --git a/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot b/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
index b8bffd4c69e5d96ad2d634c318fec76c270d1a40..e2ac051708f39d0a1ddf7be0be9f1d4eb03aa414 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
+++ b/SOL002/VNFPerformanceManagementNotification-API/Notifications.robot
@@ -17,7 +17,7 @@ VNF Performance Information Availability Notification
     ...    Test title: VNF Performance Information Availability Notification
     ...    Test objective: The objective is to test the dispatch of VNF Performance Information Availability Notification when new VNF performance information is available in the NFVO, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a subscription for information availability notifications is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
@@ -30,7 +30,7 @@ VNF Threshold Crossed Notification
     ...    Test title: VNF Threshold Crossed Notification
     ...    Test objective: The objective is to test the dispatch of VNF Threshold Crossed Notification when a previously set VNF performance metric threshold is crossed, and perform a JSON schema and content validation of the delivered notification. The action that triggers the notification under test is an explicit test step, but it is not performed by the test system.
     ...    Pre-conditions: A VNF performance job is created, and a threshold subscription is available in the VNFM.
-    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.7.1
+    ...    Reference: Clause 6.4.9.3.1 - ETSI GS NFV-SOL 002 [2] v2.8.1
     ...    Config ID: Config_prod_VNFM
     ...    Applicability: none
     ...    Post-Conditions: none 
diff --git a/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json b/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
index cbe45fa78eb1068c0153b95e2ac7a74b90231019..d286009c7d8d5cf66e9cd24fad9bf483b067203e 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
+++ b/SOL002/VNFPerformanceManagementNotification-API/jsons/PerformanceInformationAvailableNotification.json
@@ -3,6 +3,7 @@
 	"notificationType" : "PerformanceInformationAvailableNotification",
 	"subscriptionId ": "subscriptionId",
 	"timeStamp": "2012-04-21T18:25:43-05:00",
+    "pmJobId": "29f4ff6a-be91-4ec8-856e-fcf1e2479e4e",
 	"objectInstanceId": "vnfID",
 	"_links": {
 			"subscription": "link to subscription",
diff --git a/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json b/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
index 04ae7ead49cbd6f5840c13492612774825d0fb24..87a11368362a5b684b53e447c4182a29ad678c97 100644
--- a/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
+++ b/SOL002/VNFPerformanceManagementNotification-API/schemas/PerformanceInformationAvailableNotification.schema.json
@@ -1,105 +1,100 @@
 {
-    "description": "This notification informs the receiver that performance information is available. The timing of sending this notification is determined by the capability of the producing entity to evaluate the threshold crossing condition. The notification shall be triggered by the VNFM when new performance information collected by a PM job is available.\n",
-    "type": "object",
-    "required": [
-      "id",
-      "notificationType",
-      "subscriptionId",
-      "timeStamp",
-      "objectInstanceId",
-      "_links"
-    ],
-    "properties": {
-      "id": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "notificationType": {
-        "description": "Discriminator for the different notification types. Shall be set to \"PerformanceInformationAvailableNotification\" for this notification type.\n",
-        "type": "string",
-        "enum": [
-          "PerformanceInformationAvailableNotification"
-        ]
-      },
-      "subscriptionId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "timeStamp": {
-        "description": "Date-time stamp.  Representation: String formatted according to IETF RFC 3339.\n",
-        "type": "string",
-        "format": "date-time"
-      },
-      "objectInstanceId": {
-        "description": "An identifier with the intention of being globally unique.\n",
-        "type": "string"
-      },
-      "_links": {
-        "description": "Links to resources related to this notification.\n",
-        "type": "object",
-        "required": [
-          "subscription",
-          "pmJob",
-          "performanceReport"
-        ],
-        "properties": {
-          "subscription": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          },
-          "objectInstance": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          },
-          "pmJob": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          },
-          "performanceReport": {
-            "description": "This type represents a link to a resource.\n",
-            "type": "object",
-            "required": [
-              "href"
-            ],
-            "properties": {
-              "href": {
-                "description": "URI of the referenced resource.\n",
-                "type": "string",
-                "format": "url"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
\ No newline at end of file
+	"description": "This notification informs the receiver that performance information is available. The notification shall be triggered by the VNFM when new performance information collected by a PM job is available. The periodicity of triggering this notification is influenced by the  \"reportingPeriod\" attribute in the \"PmJobCriteria\" data structure.\n",
+	"type": "object",
+	"required": [
+		"id",
+		"notificationType",
+		"timeStamp",
+		"pmJobId",
+		"objectType",
+		"objectInstanceId",
+		"_links"
+	],
+	"properties": {
+		"id": {
+			"description": "An identifier with the intention of being globally unique.\n",
+			"type": "string"
+		},
+		"notificationType": {
+			"description": "Discriminator for the different notification types. Shall be set to \"PerformanceInformationAvailableNotification\" for this notification type.\n",
+			"type": "string",
+			"enum": [
+				"PerformanceInformationAvailableNotification"
+			]
+		},
+		"timeStamp": {
+			"description": "Date-time stamp. Representation: String formatted according to IETF RFC 3339.\n",
+			"type": "string",
+			"format": "date-time"
+		},
+		"pmJobId": {
+			"description": "An identifier with the intention of being globally unique.\n",
+			"type": "string"
+		},
+		"objectType": {
+			"description": "Type of the measured object. The applicable measured object type for a measurement is defined in clause 7.2 of ETSI GS NFV-IFA 027.\n",
+			"type": "string"
+		},
+		"objectInstanceId": {
+			"description": "An identifier with the intention of being globally unique.\n",
+			"type": "string"
+		},
+		"subObjectInstanceIds": {
+			"description": "Identifiers of the sub-object instances of the measured object instance for which the measurements have been taken. Shall be present if the related PM job has been set up to measure only a subset of all sub-object instances of the measured object instance and a sub-object is defined in clause\n 6.2 of ETSI GS NFV-IFA 027 for the related measured object type.\nShall be absent otherwise.\n",
+			"type": "array",
+			"items": {
+				"description": "An identifier that is unique for the respective type within a VNF instance, but may not be globally unique.\n",
+				"type": "string"
+			}
+		},
+		"_links": {
+			"description": "Links to resources related to this notification.\n",
+			"type": "object",
+			"required": [
+				"pmJob",
+				"performanceReport"
+			],
+			"properties": {
+				"objectInstance": {
+					"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+					"type": "object",
+					"required": [
+						"href"
+					],
+					"properties": {
+						"href": {
+							"description": "String formatted according to IETF RFC 3986.\n",
+							"type": "string"
+						}
+					}
+				},
+				"pmJob": {
+					"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+					"type": "object",
+					"required": [
+						"href"
+					],
+					"properties": {
+						"href": {
+							"description": "String formatted according to IETF RFC 3986.\n",
+							"type": "string"
+						}
+					}
+				},
+				"performanceReport": {
+					"description": "This type represents a link to a resource in a notification, using an absolute or relative URI.\n",
+					"type": "object",
+					"required": [
+						"href"
+					],
+					"properties": {
+						"href": {
+							"description": "String formatted according to IETF RFC 3986.\n",
+							"type": "string"
+						}
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file