diff --git a/src/Components/Document/DocEditPage.js b/src/Components/Document/DocEditPage.js
index 0e5fa20..936f001 100644
--- a/src/Components/Document/DocEditPage.js
+++ b/src/Components/Document/DocEditPage.js
@@ -68,8 +68,8 @@ const DocEditPage = () => {
       : docEditCopy.NewYork;
 
   const headerPicker = () => {
-    switch (state) {
-      case "New York":
+    switch (state.code) {
+      case "ny":
         return (
           <NewYorkCaption
             displayCopy={displayCopy}
@@ -77,7 +77,7 @@ const DocEditPage = () => {
             onScrollClick={onScrollClick}
           />
         );
-      case "New Jersey":
+      case "nj":
         return (
           <NewJerseyCaption
             displayCopy={displayCopy}
@@ -85,7 +85,7 @@ const DocEditPage = () => {
             onScrollClick={onScrollClick}
           />
         );
-      case "Florida":
+      case "fl":
         return (
           <FloridaCaption
             displayCopy={displayCopy}
@@ -424,14 +424,14 @@ const DocEditPage = () => {
           defendant: defendants,
           firm: lawFirm,
           firmCity: city,
-          firmState: usState,
+          firmState: usState.code,
           firmStreetAddress: streetAdd,
           firmZip: zipCode,
           judge: judge,
           jurisdiction: juris,
           leadAttorneys: leadAttorneys,
           plaintiff: plaintiffs,
-          state: usState,
+          state: usState.code,
           tel: telephone,
           venue: venued,
         }),
diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index b503a43..ef68e26 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -33,8 +33,9 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const isEditing = typeof editCaseId !== "undefined";
   const [isBusy, setIsBusy] = useState(false);
   const [newCaseId, setNewCaseId] = useState();
-  const caseNumCopy =
-    group.state == "New York" ? "Index Number" : "Case Number";
+  const state = group?.state[0].code ? group?.state[0].code : null;
+  console.log("state", state);
+  const caseNumCopy = state === "ny" ? "Index Number" : "Case Number";
   const [data, setData] = useState(
     getFormDataDefaults(fields, isEditing ? caseData : undefined)
   );
@@ -185,9 +186,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
                 data.caseNumber.value.length === 0
                   ? isEditing
                     ? caseData.caseNumber
-                    : stateOfCase === "NY"
-                    ? "Index Number"
-                    : "Case Number"
+                    : caseNumCopy
                   : ""
               }
             />