diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn
index a94056ebeb5a0d337c49c77f80c7c7d2f97e3835..3a535a96f74449b20a352c6d293103c457c26a77 100644
--- a/102232-1/LI-PS-PDU.asn
+++ b/102232-1/LI-PS-PDU.asn
@@ -1,5 +1,5 @@
 LI-PS-PDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 
@@ -28,7 +28,7 @@ IMPORTS
 	MessagingMMCC,
 	MessagingIRI
 		FROM EmailPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)}
 
 	-- from TS 102 232-03 [6]
 	IPCC,
@@ -42,7 +42,7 @@ IMPORTS
 	L2IRI,
 	L2IRIOnly
 		FROM L2AccessPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version6(6)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)}
 
 	-- from TS 102 232-05 [37]
 	IPMMCC,
@@ -54,7 +54,7 @@ IMPORTS
 	PstnIsdnCC,
 	PstnIsdnIRI
 		FROM PstnIsdnPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}
 
 	-- from 3GPP TS 33.108 [9]
 	IRI-Parameters,
@@ -80,21 +80,20 @@ IMPORTS
 		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)}
 			-- The relevant module (including the UMTS release and version number) needs
 			-- to be chosen when compiling the application.
-
-
-	-- from 3GPP TS 33.108 [9]
-	CC-PDU
-		FROM Umts-HI3-PS
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3(2)}
-			-- The relevant module (including the UMTS release and version number)
-			-- needs to be chosen when compiling the application.
 	
 	-- from 3GPP TS 33.108 [9]
-	CC-PDU
-		FROM Eps-HI3-PS
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)}
-			-- The relevant module (including the UMTS release and version number)
-			-- needs to be chosen when compiling the application.
+    CC-PDU
+        FROM Umts-HI3-PS
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3(2)}
+            -- The relevant module (including the UMTS release and version number)
+            -- needs to be chosen when compiling the application.
+
+    -- from 3GPP TS 33.108 [9]
+    CC-PDU
+        FROM Eps-HI3-PS
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)}
+            -- The relevant module (including the UMTS release and version number)
+            -- needs to be chosen when compiling the application.
 
 	-- from TS 101 909-20-1 [33]
 	TARGETACTIVITYMONITOR-1,
@@ -129,7 +128,7 @@ IMPORTS
 
 lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
 
-li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)}
+li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version18(18)}
 
 -- ====================
 -- Top-level definition
@@ -253,8 +252,8 @@ CCContents ::= CHOICE
 	cCIPPacketHeader	[13] CDMA2000CCModule.CCIPPacketHeader,
 	messagingCC			[14] MessagingCC,
 	ePSCC				[15] OCTET STRING,
-	uMTSCC-CC-PDU			[16] Umts-HI3-PS.CC-PDU,
-	ePSCC-CC-PDU			[17] Eps-HI3-PS.CC-PDU,
+	uMTSCC-CC-PDU		[16] Umts-HI3-PS.CC-PDU,
+    ePSCC-CC-PDU		[17] Eps-HI3-PS.CC-PDU,
 	messagingMMCC		[18] MessagingMMCC
 }
 
@@ -344,22 +343,22 @@ EPSIRI ::= CHOICE
 
 TRIPayload ::= CHOICE
 {
-	integrityCheck				[0] IntegrityCheck,
-	testPDU						[1] NULL,
-	paddingPDU					[2] OCTET STRING,
+	integrityCheck					[0] IntegrityCheck,
+	testPDU							[1] NULL,
+	paddingPDU						[2] OCTET STRING,
 		-- Undefined contents (will be discarded)
-	keep-alive					[3] NULL,
-	keep-aliveResponse			[4] NULL,
-	firstSegmentFlag			[5] NULL,
-	lastSegmentFlag				[6] NULL,
+	keep-alive						[3] NULL,
+	keep-aliveResponse				[4] NULL,
+	firstSegmentFlag				[5] NULL,
+	lastSegmentFlag					[6] NULL,
 	...,
-	cINReset					[7] NULL,
-	operatorLeaMessage			[8] OperatorLeaMessage,
-	optionRequest				[9] OptionRequest,
-	optionResponse				[10] OptionResponse,
-	optionComplete				[11] NULL,
-	pDUAcknowledgementRequest	[12] NULL,
-	pDUAcknowledgementResponse	[13] NULL
+	cINReset						[7] NULL,
+	operatorLeaMessage				[8] OperatorLeaMessage,
+	optionRequest					[9] OptionRequest,
+	optionResponse					[10] OptionResponse,
+	optionComplete					[11] NULL,
+	pDUAcknowledgementRequest		[12] NULL,
+	pDUAcknowledgementResponse		[13] NULL
 }
 
 IntegrityCheck ::= SEQUENCE
diff --git a/102232-1/portal/LI-PS-PDU,ver17.txt b/102232-1/portal/LI-PS-PDU,ver18.txt
similarity index 90%
rename from 102232-1/portal/LI-PS-PDU,ver17.txt
rename to 102232-1/portal/LI-PS-PDU,ver18.txt
index a94056ebeb5a0d337c49c77f80c7c7d2f97e3835..3a535a96f74449b20a352c6d293103c457c26a77 100644
--- a/102232-1/portal/LI-PS-PDU,ver17.txt
+++ b/102232-1/portal/LI-PS-PDU,ver18.txt
@@ -1,5 +1,5 @@
 LI-PS-PDU
-{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version17(17)}
+{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version18(18)}
 
 DEFINITIONS IMPLICIT TAGS ::=
 
@@ -28,7 +28,7 @@ IMPORTS
 	MessagingMMCC,
 	MessagingIRI
 		FROM EmailPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version12(12)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version13(13)}
 
 	-- from TS 102 232-03 [6]
 	IPCC,
@@ -42,7 +42,7 @@ IMPORTS
 	L2IRI,
 	L2IRIOnly
 		FROM L2AccessPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version6(6)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version7(7)}
 
 	-- from TS 102 232-05 [37]
 	IPMMCC,
@@ -54,7 +54,7 @@ IMPORTS
 	PstnIsdnCC,
 	PstnIsdnIRI
 		FROM PstnIsdnPDU
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version4(4)}
+		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}
 
 	-- from 3GPP TS 33.108 [9]
 	IRI-Parameters,
@@ -80,21 +80,20 @@ IMPORTS
 		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)}
 			-- The relevant module (including the UMTS release and version number) needs
 			-- to be chosen when compiling the application.
-
-
-	-- from 3GPP TS 33.108 [9]
-	CC-PDU
-		FROM Umts-HI3-PS
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3(2)}
-			-- The relevant module (including the UMTS release and version number)
-			-- needs to be chosen when compiling the application.
 	
 	-- from 3GPP TS 33.108 [9]
-	CC-PDU
-		FROM Eps-HI3-PS
-		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)}
-			-- The relevant module (including the UMTS release and version number)
-			-- needs to be chosen when compiling the application.
+    CC-PDU
+        FROM Umts-HI3-PS
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3(2)}
+            -- The relevant module (including the UMTS release and version number)
+            -- needs to be chosen when compiling the application.
+
+    -- from 3GPP TS 33.108 [9]
+    CC-PDU
+        FROM Eps-HI3-PS
+        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)}
+            -- The relevant module (including the UMTS release and version number)
+            -- needs to be chosen when compiling the application.
 
 	-- from TS 101 909-20-1 [33]
 	TARGETACTIVITYMONITOR-1,
@@ -129,7 +128,7 @@ IMPORTS
 
 lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}
 
-li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version17(17)}
+li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version18(18)}
 
 -- ====================
 -- Top-level definition
@@ -253,8 +252,8 @@ CCContents ::= CHOICE
 	cCIPPacketHeader	[13] CDMA2000CCModule.CCIPPacketHeader,
 	messagingCC			[14] MessagingCC,
 	ePSCC				[15] OCTET STRING,
-	uMTSCC-CC-PDU			[16] Umts-HI3-PS.CC-PDU,
-	ePSCC-CC-PDU			[17] Eps-HI3-PS.CC-PDU,
+	uMTSCC-CC-PDU		[16] Umts-HI3-PS.CC-PDU,
+    ePSCC-CC-PDU		[17] Eps-HI3-PS.CC-PDU,
 	messagingMMCC		[18] MessagingMMCC
 }
 
@@ -344,22 +343,22 @@ EPSIRI ::= CHOICE
 
 TRIPayload ::= CHOICE
 {
-	integrityCheck				[0] IntegrityCheck,
-	testPDU						[1] NULL,
-	paddingPDU					[2] OCTET STRING,
+	integrityCheck					[0] IntegrityCheck,
+	testPDU							[1] NULL,
+	paddingPDU						[2] OCTET STRING,
 		-- Undefined contents (will be discarded)
-	keep-alive					[3] NULL,
-	keep-aliveResponse			[4] NULL,
-	firstSegmentFlag			[5] NULL,
-	lastSegmentFlag				[6] NULL,
+	keep-alive						[3] NULL,
+	keep-aliveResponse				[4] NULL,
+	firstSegmentFlag				[5] NULL,
+	lastSegmentFlag					[6] NULL,
 	...,
-	cINReset					[7] NULL,
-	operatorLeaMessage			[8] OperatorLeaMessage,
-	optionRequest				[9] OptionRequest,
-	optionResponse				[10] OptionResponse,
-	optionComplete				[11] NULL,
-	pDUAcknowledgementRequest	[12] NULL,
-	pDUAcknowledgementResponse	[13] NULL
+	cINReset						[7] NULL,
+	operatorLeaMessage				[8] OperatorLeaMessage,
+	optionRequest					[9] OptionRequest,
+	optionResponse					[10] OptionResponse,
+	optionComplete					[11] NULL,
+	pDUAcknowledgementRequest		[12] NULL,
+	pDUAcknowledgementResponse		[13] NULL
 }
 
 IntegrityCheck ::= SEQUENCE