diff --git a/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.011-24.012.sql b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.011-24.012.sql
new file mode 100644
index 000000000..e0e470d84
--- /dev/null
+++ b/ONPRC_EHR_ComplianceDB/resources/schemas/dbscripts/sqlserver/onprc_ehr_compliancedb-24.011-24.012.sql
@@ -0,0 +1,66 @@
+
+
+EXEC core.fn_dropifexists 'p_ComplianceAccesscontainerUpdate', 'onprc_ehr_compliancedb', 'PROCEDURE';
+GO
+
+-- Author:	R. Blasa
+-- Created: 10-2-2024
+
+/*
+**
+** 	Created by
+**      Blasa  		9-5-2025               Storedprocedure to update Compliance Access contaimer values.
+**                             .
+**
+**
+**
+*/
+
+CREATE Procedure onprc_ehr_compliancedb.p_ComplianceAccesscontainerUpdate
+
+
+    AS
+
+
+
+BEGIN
+
+          ------ Update container value and include as part of the main Compliance module
+
+If exists(Select * from  ehr_Compliancedb.CompletionDates ss where ss.container =  'F1C05E2D-618D-103D-ABC9-9814909BFFCD' )
+BEGIN
+
+Update ss
+set ss.container =   'CD170458-C55F-102F-9907-5107380A54BE'    ----Compliance folder on Prime Production
+
+    from  ehr_Compliancedb.CompletionDates ss
+Where ss.container = 'F1C05E2D-618D-103D-ABC9-9814909BFFCD'    ---Compliance Access folder on Prime Production
+
+    If @@Error <> 0
+    GoTo Err_Proc
+
+END
+
+ELSE             ------ No new entries exit
+BEGIN
+
+GOTO No_Records
+
+END
+
+
+
+
+No_Records:
+
+ RETURN 0
+
+
+Err_Proc:
+                    -------Error Generated, Transfer process stopped
+	RETURN 1
+
+
+END
+
+GO
\ No newline at end of file
diff --git a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
index 993af29fb..d81498a0b 100644
--- a/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
+++ b/ONPRC_EHR_ComplianceDB/src/org/labkey/ONPRCEHR_ComplianceDB/ONPRC_EHR_ComplianceDBModule.java
@@ -55,7 +55,7 @@ public String getName()
     @Override
     public Double getSchemaVersion()
     {
-        return 24.011;
+        return 24.012;
     }
 
     @Override
diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/Pairing_Properties.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/Pairing_Properties.js
index 86f14a441..84267be89 100644
--- a/onprc_ehr/resources/web/onprc_ehr/model/sources/Pairing_Properties.js
+++ b/onprc_ehr/resources/web/onprc_ehr/model/sources/Pairing_Properties.js
@@ -22,12 +22,7 @@ EHR.model.DataModelManager.registerMetadata('Pairing_Properties', {
                 }
             },
 
-            eventtype: {
-                allowBlank: false,
-                lookup: {
-                    sort: 'sort_order'
-                }
-            },
+
             goal: {
                 allowBlank: false,
                 lookup: {
@@ -37,12 +32,35 @@ EHR.model.DataModelManager.registerMetadata('Pairing_Properties', {
                 }
             },
 
-            endeventType: {
+            eventtype: {
+                columnConfig: {
+                    width: 250
+                },
+                editorConfig: {
+                    caseSensitive: false,
+                    anyMatch: true,
+                    listConfig: {
+                        innerTpl: '{[(values.category ? "<b>" + LABKEY.Utils.encodeHtml(values.category) + ":</b> " : "") + LABKEY.Utils.encodeHtml(values.value)]}',
+                        getInnerTpl: function () {
+                            return this.innerTpl;
+                        }
+                    }
+                },
                 lookup: {
-                    sort: 'sort_order'
+                    xtype: 'combobox',
+                    schemaName: 'ehr_Lookups',
+                    queryName: 'pairingeventsAll',
+                    columns: 'value,category,sort_order,date_disabled',
+                    keyColumn: 'value',
+                    displayColumn: 'value',
+                    sort: 'category,value,sort_order',
+                    filterArray: [
+                        LABKEY.Filter.create('date_disabled', null, LABKEY.Filter.Types.ISBLANK)
+                    ]
                 }
             },
 
+
             enddate: {
                 hidden: false
             },