diff --git a/src/Components/Case/CaseDetailsPage.js b/src/Components/Case/CaseDetailsPage.js
index 8ddf861..fed3151 100644
--- a/src/Components/Case/CaseDetailsPage.js
+++ b/src/Components/Case/CaseDetailsPage.js
@@ -23,6 +23,7 @@ const CaseDetailsPage = () => {
   const message =
     "Parsing document.  Please be patient, this may take several minutes.";
 
+  console.log("----------->caseId in caseDetails", caseId);
   const handleNavigate = () => {
     navigate("/documents");
   };
diff --git a/src/Components/Modals/CreateModal.js b/src/Components/Modals/CreateModal.js
index 40be97e..77dff73 100644
--- a/src/Components/Modals/CreateModal.js
+++ b/src/Components/Modals/CreateModal.js
@@ -29,8 +29,10 @@ const CreateModal = ({ setShowModal, caseData }) => {
   const appUserId = group.appUserId;
   const editCaseId = caseData?.id;
   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 [data, setData] = useState(
     getFormDataDefaults(fields, isEditing ? caseData : undefined)
   );
@@ -73,6 +75,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
         const casesRef = collection(db, "cases");
         await setDoc(doc(casesRef, `${caseId}`), caseData);
         setShowModal(false);
+        return caseId;
       } catch (err) {
         console.log("Error creating case:", err);
       }
@@ -88,21 +91,26 @@ const CreateModal = ({ setShowModal, caseData }) => {
     }
   };
 
+  const handleCreateCaseNavigation = (caseId) => {
+    console.log("caseId in handleCreateCaseNavigation", caseId);
+  };
+
   const handleCreateCase = (e) => {
     e.preventDefault();
     const dataValues = validateData();
-
+    let caseId;
     if (dataValues === null) {
       return;
     } else {
       try {
-        saveCaseData(dataValues);
+        saveCaseData(dataValues).then((res) => {
+          const caseId = res;
+          navigate(`/casedetails/${caseId}`);
+        });
       } catch (err) {
         console.log(err);
       }
     }
-
-    navigate("/dashboard");
   };
 
   const radioOptions = [
@@ -168,7 +176,7 @@ const CreateModal = ({ setShowModal, caseData }) => {
         <Row>
           <Col className="mb-3">
             {isEditing ? (
-              <div className="edit-modal-label">Index number</div>
+              <div className="edit-modal-label">{caseNumCopy}</div>
             ) : (
               <></>
             )}