diff --git a/lib/lambda/ses-email-templates.ts b/lib/lambda/ses-email-templates.ts
index 5505272c11..36878fc022 100644
--- a/lib/lambda/ses-email-templates.ts
+++ b/lib/lambda/ses-email-templates.ts
@@ -247,7 +247,7 @@ spa@cms.hhs.gov or your state lead.
 Thank you!`,
   },
   {
-    name: "withdraw-package-1915b-cms",
+    name: "withdraw-package-waiver-cms",
     subject: "Waiver Package {{id}} Withdraw Request",
     html: `
 <p>The OneMAC Submission Portal received a request to withdraw the package below.
@@ -264,34 +264,34 @@ Summary:
 <p>If the contents of this email seem suspicious, do not open them, and instead 
 forward this email to <a href='mailto:SPAM@cms.hhs.gov'>SPAM@cms.hhs.gov</a>.</p>
 <p>Thank you!</p>`,
-text: `
-he OneMAC Submission Portal received a request to withdraw the package below.
+    text: `
+The OneMAC Submission Portal received a request to withdraw the package below.
 The package will no longer be considered for CMS review:
 
 State or territory: {{territory}}
 Name: {{submitterName}}
 Email: {{submitterEmail}}
-{{actionType}} Number: {{id}}
+Waiver Number: {{id}}
 
 Summary:
 {{additionalInformation}}
 
 If the contents of this email seem suspicious, do not open them, and instead forward this email to SPAM@cms.hhs.gov.
 
-Thank you!`
+Thank you!`,
   },
   {
-    name: "withdraw-package-1915b-state",
-    subject: "1915(b) Waiver {{id}} Withdrawal Confirmation",
+    name: "withdraw-package-waiver-state",
+    subject: "{{authority}} Waiver {{id}} Withdrawal Confirmation",
     html: `
-<p>This email is to confirm 1915(b) Waiver {{id}} was withdrawn
-by {{submitterName}}. The review of 1915(b) Waiver {{id}} has concluded.</p>
+<p>This email is to confirm {{authority}} Waiver {{id}} was withdrawn
+by {{submitterName}}. The review of {{authority}} Waiver {{id}} has concluded.</p>
 <p>If you have questions, please contact 
 <a href='mailto:spa@cms.hhs.gov'>spa@cms.hhs.gov</a> or your state lead.</p>
 <p>Thank you!</p>`,
     text: `
-This email is to confirm 1915(b) Waiver {{id}} was withdrawn by {{submitterName}}.
-The review of 1915(b) Waiver {{id}} has concluded.
+This email is to confirm {{authority}} Waiver {{id}} was withdrawn by {{submitterName}}.
+The review of {{authority}} Waiver {{id}} has concluded.
 
 If you have questions, please contact spa@cms.hhs.gov or your state lead.
 
@@ -529,7 +529,7 @@ Any other correspondence will be disregarded.
 
 If you have any questions, please contact spa@cms.hhs.gov or your state lead.
 
-Thank you!`
+Thank you!`,
   },
   {
     name: "withdraw-rai-1915b-state",
@@ -572,7 +572,7 @@ Any other correspondence will be disregarded.
 
 If you have any questions, please contact spa@cms.hhs.gov or your state lead.
 
-Thank you!`
+Thank you!`,
   },
   {
     name: "withdraw-package-medicaid-spa-cms",
@@ -967,10 +967,10 @@ If you have any questions, please contact CHIPSPASubmissionMailbox@cms.hhs.gov o
 Thank you!`,
   },
   {
-    name: "respond-to-rai-1915b-cms",
+    name: "respond-to-rai-waiver-cms",
     subject: "Waiver RAI Response for {{id}} Submitted",
     html: `
-<p>The OneMAC Submission Portal received a 1915(b) Waiver RAI Response Submission:</p>
+<p>The OneMAC Submission Portal received a {{authority}} Waiver RAI Response Submission:</p>
 <ul>
 <li>The submission can be accessed in the OneMAC application, which you 
 can find at <a href='{{applicationEndpoint}}'>this link</a>.</li>
@@ -996,7 +996,7 @@ Summary:
 forward this email to <a href='mailto:SPAM@cms.hhs.gov'>SPAM@cms.hhs.gov</a>.</p>
 <p>Thank you!</p>`,
     text: `
-The OneMAC Submission Portal received a 1915(b) Waiver RAI Response Submission:
+The OneMAC Submission Portal received a {{authority}} Waiver RAI Response Submission:
 
 - The submission can be accessed in the OneMAC application, which you can 
   find at {{applicationEndpoint}}.
@@ -1024,11 +1024,11 @@ forward this email to SPAM@cms.hhs.gov.
 Thank you!`,
   },
   {
-    name: "respond-to-rai-1915b-state",
+    name: "respond-to-rai-waiver-state",
     subject:
-      "Your 1915(b) Waiver RAI Response for {{id}} has been submitted to CMS",
+      "Your {{authority}} Waiver RAI Response for {{id}} has been submitted to CMS",
     html: `
-<p>This response confirms the submission of your 1915(b) Waiver RAI Response to CMS for review:</p>
+<p>This response confirms the submission of your {{authority}} Waiver RAI Response to CMS for review:</p>
 <p>
 <br><b>State or territory:</b> {{territory}}
 <br><b>Name:</b> {{submitterName}}
@@ -1053,7 +1053,7 @@ requests on Waivers only.  Any other correspondence will be disregarded.
 or your state lead.</p>
 <p>Thank you!</p>`,
     text: `
-This response confirms the submission of your 1915(b) Waiver RAI Response to CMS for review:
+This response confirms the submission of your {{authority}} Waiver RAI Response to CMS for review:
 
 State or territory: {{territory}}
 Name: {{submitterName}}
@@ -1231,7 +1231,7 @@ Thank you!`,
     name: "temporary-extension-cms",
     subject: "{{authority}} Waiver Extension {{id}} Submitted",
     html: `
-<p>The Submission Portal received a {{authority}} Waiver Extension Submission:</p>
+<p>The OneMAC Submission Portal received a {{authority}} Waiver Extension Submission:</p>
 <ul>
 <li>The submission can be accessed in the OneMAC application, which you 
 can find at <a href='{{applicationEndpoint}}'>this link</a>.</li>
diff --git a/lib/libs/email/bundle-lib.ts b/lib/libs/email/bundle-lib.ts
index dbd2442bd7..237f7b0825 100644
--- a/lib/libs/email/bundle-lib.ts
+++ b/lib/libs/email/bundle-lib.ts
@@ -1,4 +1,4 @@
-import { Action } from "shared-types";
+import { Action } from "../../packages/shared-types";
 import { DecodedRecord } from "./handler-lib";
 
 interface EmailCommand {
@@ -83,6 +83,7 @@ const getBundleFromEvent = (
         ],
       };
     case "respond-to-rai-1915b":
+    case "respond-to-rai-1915c":
       return {
         lookupList: ["osInsights"],
         dataList: [
@@ -104,16 +105,17 @@ const getBundleFromEvent = (
         ],
         emailCommands: [
           {
-            Template: `respond-to-rai-1915b-cms_${stage}`,
+            Template: `respond-to-rai-waiver-cms_${stage}`,
             ToAddresses: ["osgEmail", "cpoc", "srt", "dmcoEmail"],
           },
           {
-            Template: `respond-to-rai-1915b-state_${stage}`,
+            Template: `respond-to-rai-waiver-state_${stage}`,
             ToAddresses: ["submitter"],
           },
         ],
       };
     case "withdraw-package-1915b":
+    case "withdraw-package-1915c":
       return {
         lookupList: ["osInsights", "cognito"],
         dataList: [
@@ -126,14 +128,15 @@ const getBundleFromEvent = (
           "submitterName",
           "submitterEmail",
           "additionalInformation",
+          "authority",
         ],
         emailCommands: [
           {
-            Template: `withdraw-package-1915b-cms_${stage}`,
-            ToAddresses: ["osgEmail", "cpoc", "srt"],
+            Template: `withdraw-package-waiver-cms_${stage}`,
+            ToAddresses: ["osgEmail", "cpoc", "srt", "dmcoEmail"],
           },
           {
-            Template: `withdraw-package-1915b-state_${stage}`,
+            Template: `withdraw-package-waiver-state_${stage}`,
             ToAddresses: ["allState"],
           },
         ],
@@ -244,7 +247,7 @@ const getBundleFromEvent = (
         emailCommands: [
           {
             Template: `new-submission-chip-spa-cms_${stage}`,
-            ToAddresses: ["osgEmail", "chipInbox"],
+            ToAddresses: ["chipInbox"],
             CcAddresses: ["chipCcList"],
           },
           {
@@ -255,7 +258,7 @@ const getBundleFromEvent = (
       };
     case "respond-to-rai-chip-spa":
       return {
-        lookupList: ["osInsights"],
+        lookupList: ["osInsights", "cognito"],
         dataList: [
           "osgEmail",
           "chipInbox",
@@ -271,11 +274,13 @@ const getBundleFromEvent = (
           "additionalInformation",
           "formattedFileList",
           "textFileList",
+          "srt",
+          "cpoc",
         ],
         emailCommands: [
           {
             Template: `respond-to-rai-chip-spa-cms_${stage}`,
-            ToAddresses: ["osgEmail", "chipInbox"],
+            ToAddresses: ["srt", "chipInbox", "cpoc"],
             CcAddresses: ["chipCcList"],
           },
           {
diff --git a/lib/libs/email/data-lib.ts b/lib/libs/email/data-lib.ts
index f2ffca686f..2a35e335c4 100644
--- a/lib/libs/email/data-lib.ts
+++ b/lib/libs/email/data-lib.ts
@@ -5,8 +5,8 @@ import {
   AttachmentKey,
   attachmentTitleMap,
   EmailAddresses,
-} from "shared-types";
-import { getSecret } from "shared-utils";
+} from "../../packages/shared-types";
+import { getSecret } from "../../packages/shared-utils";
 
 interface Attachment {
   title: keyof typeof attachmentTitleMap;
@@ -171,7 +171,10 @@ export const buildEmailData = async (
           emailAddresses[dataType] ??
           `'${dataType} Substitute' <mako.stateuser@gmail.com>`;
         break;
-        
+      case "additionalInformation":
+        returnObject[dataType] =
+          data[dataType] ?? "No additional information submitted";
+        break;
       default:
         returnObject[dataType] =
           data[dataType] ?? lookupValues[dataType] ?? "missing data";
diff --git a/package.json b/package.json
index 703002bb05..5bca37b4e9 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "cdk-serverless-clamscan": "^2.8.1",
     "constructs": "^10.3.0",
     "esbuild": "^0.21.5",
+    "luxon": "^3.5.0",
     "source-map-support": "^0.5.21",
     "tsx": "4.15.7"
   },
@@ -49,6 +50,7 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@types/jest": "^29.5.12",
+    "@types/luxon": "^3.4.2",
     "@types/node": "20.14.2",
     "@vitest/coverage-c8": "^0.29.8",
     "@vitest/coverage-istanbul": "^2.0.5",