diff --git a/packages/admin/src/api/studentAPI.jsx b/packages/admin/src/api/studentAPI.jsx
index 9fa0ae0e..47b15056 100644
--- a/packages/admin/src/api/studentAPI.jsx
+++ b/packages/admin/src/api/studentAPI.jsx
@@ -39,7 +39,10 @@ const studentAPI = async (data) => {
     noOfSiblings: data.noOfSiblings,
     motherName : data.motherName,
     fatherName : data.fatherName,
-    medium : data.medium
+    medium : data.medium,
+    state : data.state,
+    block : data.block,
+    district : data.district,
     // studentEnrollId: data.studentEnrollId,
   };
 
diff --git a/packages/admin/src/api/studentUpdateAPI.jsx b/packages/admin/src/api/studentUpdateAPI.jsx
index c7d97ca5..ae918aa0 100644
--- a/packages/admin/src/api/studentUpdateAPI.jsx
+++ b/packages/admin/src/api/studentUpdateAPI.jsx
@@ -38,7 +38,10 @@ const studentUpdateAPI = async (data) => {
     noOfSiblings: data.noOfSiblings,
     motherName : data.motherName,
     fatherName : data.fatherName,
-    medium : data.medium
+    medium : data.medium,
+    state : data.state,
+    block : data.block,
+    district : data.district,
     // studentEnrollId: data.studentEnrollId,
   };
 
diff --git a/packages/admin/src/components/StudentForm.jsx b/packages/admin/src/components/StudentForm.jsx
index 06d96c11..f5b11ae1 100644
--- a/packages/admin/src/components/StudentForm.jsx
+++ b/packages/admin/src/components/StudentForm.jsx
@@ -7,7 +7,7 @@ import StudentSchema from "schema/StudentSchema";
 import React, { useEffect, useState} from "react";
 import axios from "axios";
 import styles from "./StudentForm.module.css";
-import { groupSearch, schoolSearch } from "routes/links";
+import { groupSearch, schoolSearch,getStateList,getBlockList, getBlockList } from "routes/links";
 import studentUpdateAPI from "api/studentUpdateAPI";
 
 function StudentForm({ studentData }) {
@@ -19,7 +19,13 @@ function StudentForm({ studentData }) {
   const [selectedgroup, setSelectedgroup] = useState(""); // Initialize with an empty string
 
   const [groups, setGroups] = useState([]);
-
+  const [stateData,setStateData] = useState([])
+  const [districtData, setDistrictData] = useState([])
+  const [blockData,setBlockData] = useState([])
+  const [selectedState, setSelectedState] = useState("");
+  const [selectedDistrict, setSelectedDistrict] = useState(""); 
+  const [selectedBlock, setSelectedBlock] = useState(""); 
+  const [loading, setLoading] = useState(false);
   const {
     register,
     handleSubmit,
@@ -48,6 +54,17 @@ function StudentForm({ studentData }) {
         setSelectedgroup(selectedGroup?.name);
       }
 
+      if(studentData.state){
+        setSelectedState(studentData?.state);
+      }
+
+      if(studentData.block){
+        setSelectedBlock(studentData?.block)
+      }
+
+      if(studentData.district){
+        setSelectedDistrict(studentData?.district)
+      }
       
       // Set the other form data, like dateOfBirth
       const formattedDateOfBirth = studentData?.dateOfBirth?.split("T")[0];
@@ -57,33 +74,119 @@ function StudentForm({ studentData }) {
       });
     }
   }, [studentData, data, groups, reset]);
-  
 
+  const MAX_RETRIES = 1;
+  
+  const retryApiCall = async (apiCall, retries = MAX_RETRIES) => {
+    let attempt = 0;
+    while (attempt < retries) {
+      try {
+        const response = await apiCall();
+        return response;
+      } catch (error) {
+        if (error.response && error.response.status === 500) {
+          attempt += 1;
+          console.error(`Retrying API call... Attempt ${attempt}`);
+          if (attempt >= retries) throw error; // Throw error after max retries
+        } else {
+          throw error;
+        }
+      }
+    }
+  };
+  
   useEffect(() => {
-    if (token) {
-    const headers = {
-      Accept: "*/*",
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json",
-    };
+    if (token && studentData) {
+      setLoading(true);
+  
+      const headers = {
+        Accept: "*/*",
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      };
+  
+      const requestDataSchool = { page: 0, filters: {} };
+      const requestDataDistrict = { state: studentData.state };
+      const requestDataBlock = { district: studentData.district };
+  
+      const apiCalls = [
+        () => axios.post(schoolSearch, requestDataSchool, { headers }),
+        () => axios.post(getStateList, {}, { headers }),
+        studentData.state
+          ? () => axios.post(getDistrictList, requestDataDistrict, { headers })
+          : null,
+          studentData.district
+          ? () => axios.post(getBlockList, requestDataBlock, { headers })
+          : null,
+      ].filter(Boolean);
+  
+      Promise.all(apiCalls.map((call) => retryApiCall(call)))
+        .then(([schoolResponse, stateResponse, districtResponse, blockResponse]) => {
+          if (schoolResponse) setData(schoolResponse.data.data);
+          if (stateResponse) setStateData(stateResponse.data.data);
+          if (districtResponse) setDistrictData(districtResponse.data.data);
+          if (blockResponse) setBlockData(blockResponse.data.data);
+        })
+        .catch((error) => {
+          console.error("Error fetching data:", error);
+        })
+        .finally(() => {
+          setLoading(false);
+        });
+    }
+  }, [token,studentData]);
 
-    const requestData = {
-      page: 0,
-      filters: {},
-    };
+  //when change in state
+  const handleStateChangeApi = (selectedState) => {
+    if (token && selectedState) {
+      const headers = {
+        Accept: "*/*",
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      };
+      const requestData = { state: selectedState };
+  
+      axios.post(getDistrictList, requestData, { headers })
+        .then((response) => {
+          setDistrictData(response.data.data);
+          setLoading(false);
+        })
+        .catch((error) => {
+          console.error("Error fetching district data:", error);
+        });
+    }
+  };
 
-    axios
-      .post(schoolSearch, requestData, { headers })
-      .then((response) => {
-        setData(response.data.data);
-      })
-      .catch((error) => {
-        // Handle any errors here
-        console.error("Error fetching data:", error);
-      });
+  const handleDistrictChangeApi = (selectedDistrict) => {
+    if (token && selectedDistrict) {
+      const headers = {
+        Accept: "*/*",
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json",
+      };
+      const requestData = { district: selectedDistrict };
+      axios.post(getBlockList, requestData, { headers })
+        .then((response) => {
+          setBlockData(response.data.data);
+          setLoading(false);
+        })
+        .catch((error) => {
+          console.error("Error fetching block data:", error);
+        });
     }
-  }, [token]);
+  }
+  const handleStateChange = (e) => {
+    const newState = e.target.value;
+    setSelectedState(newState);
+    handleStateChangeApi(newState);
+  };
 
+  const handleDistrictChange = (e) => {
+    const newDistrict = e.target.value;
+    setSelectedDistrict(newDistrict);
+    handleDistrictChangeApi(newDistrict);
+  };
+  
   useEffect(() => {
     if(selectedUdiseCode.length > 0){
     if (Object.keys(selectedUdiseCode).length) {
@@ -161,6 +264,9 @@ function StudentForm({ studentData }) {
 
   return (
     <div>
+      {loading ? (
+      <div className={styles.loader}>Loading...</div>
+    ) : (
       <form
         className=" card-body form-floating mt-3 mx-1"
         autoComplete="off"
@@ -349,9 +455,9 @@ function StudentForm({ studentData }) {
                   {...register("group")}
                   value={selectedgroup}
                   onChange={(e) => setSelectedgroup(e.target.value)}
+                  disabled={studentData} // Disable the field in edit mode
                 >
-                  <option value="">Select Group</option>{" "}
-                  {/* Placeholder option */}
+                  <option value="">Select Group</option>
                   {groups.map((school) => (
                     <option key={school.name} value={school.name}>
                       {school.name}
@@ -359,9 +465,6 @@ function StudentForm({ studentData }) {
                   ))}
                 </select>
 
-                {/* <label className="form-label" htmlFor="udise">
-                  Group
-                </label> */}
                 <div className={styles.errorMessage}>
                   {errors.group && <p>{errors.group.message}</p>}
                 </div>
@@ -483,40 +586,6 @@ function StudentForm({ studentData }) {
               </div>
             </div>
             <br></br>
-            <div className="form-floating">
-              <input
-                className={styles.formControl}
-                type="text"
-                name="motherName"
-                id="motherName"
-                placeholder="Mother Name"
-                {...register("motherName")}
-              ></input>
-              {/* <label className="form-label" htmlFor="motherName">
-                Mother Name
-              </label> */}
-              <div className={styles.errorMessage}>
-                {errors.motherName && <p>{errors.motherName.message}</p>}
-              </div>
-            </div>
-            <br></br>
-            <div className="form-floating">
-              <input
-                className={styles.formControl}
-                type="text"
-                name="fatherName"
-                id="fatherName"
-                placeholder="Father Name"
-                {...register("fatherName")}
-              ></input>
-              {/* <label className="form-label" htmlFor="fatherName">
-                Father Name
-              </label> */}
-              <div className={styles.errorMessage}>
-                {errors.fatherName && <p>{errors.fatherName.message}</p>}
-              </div>
-            </div>
-            <br></br>
             <div className="form-floating">
               <input
                 className={styles.formControl}
@@ -641,67 +710,73 @@ function StudentForm({ studentData }) {
             </div>
             <br></br> */}
             <div className="form-floating">
-              <input
-                className={styles.formControl}
-                type="text"
+              <select
+                className={styles.selectWrapper}
                 name="state"
                 id="state"
-                placeholder="State"
+                value={selectedState || ""}  
                 {...register("state")}
-              ></input>
-              {/* <label className="form-label" htmlFor="state">
-                State
-              </label> */}
+                onChange={handleStateChange}
+              >
+                <option value="">Select State</option>
+                {stateData.map((state, index) => (
+                  <option key={index} value={state.state}>
+                    {state.state}
+                  </option>
+                ))}
+              </select>
               <div className={styles.errorMessage}>
                 {errors.state && <p>{errors.state.message}</p>}
               </div>
             </div>
             <br></br>
             <div className="form-floating">
-              <input
-                className={styles.formControl}
-                type="text"
-                name="block"
-                id="block"
-                placeholder="Block"
-                {...register("block")}
-              ></input>
-              {/* <label className="form-label" htmlFor="block">
-                Block
-              </label> */}
+              <select
+                className={styles.selectWrapper}
+                name="district"
+                id="district"
+                {...register("district")}
+                value={selectedDistrict || ""}
+                onChange={handleDistrictChange}
+                disabled={!selectedState} 
+              >
+                <option value="">Select District</option>
+                 {districtData.map((district, index) => (
+                    <option key={index} value={district.district}>
+                      {district.district}
+                    </option>
+                  ))}
+              </select>
+
               <div className={styles.errorMessage}>
-                {errors.block && <p>{errors.block.message}</p>}
+                {errors.district && <p>{errors.district.message}</p>}
               </div>
             </div>
+
             <br></br>
-            {/* <div className="form-floating">
-              <input
-                className={styles.formControl}
-                type="text"
-                name="serialNo"
-                id="serialNo"
-                placeholder="Serial No"
-                {...register("serialNo")}
-              ></input>
-              <div className={styles.errorMessage}>
-                {errors.serialNo && <p>{errors.serialNo.message}</p>}
-              </div>
-            </div>
-            <br></br> */}
             <div className="form-floating">
-              <input
-                className={styles.formControl}
-                type="text"
-                name="district"
-                id="district"
-                placeholder="District"
-                {...register("district")}
-              ></input>
-              {/* <label className="form-label" htmlFor="district">
-                District
-              </label> */}
+              <select
+                className={styles.selectWrapper}
+                name="block"
+                id="block"
+                value={selectedBlock || ""}
+                {...register("block")}
+                onChange={(e) => {
+                  const selectedValue = e.target.value;
+                  setSelectedBlock(selectedValue); 
+                  }}
+                disabled={!selectedDistrict} 
+              >
+               <option value="">Select Block</option>
+                 {blockData.map((block, index) => (
+                    <option key={index} value={block.block}>
+                      {block.block}
+                    </option>
+                  ))}
+              </select>
+
               <div className={styles.errorMessage}>
-                {errors.district && <p>{errors.district.message}</p>}
+                {errors.block && <p>{errors.block.message}</p>}
               </div>
             </div>
             <br></br>
@@ -719,7 +794,7 @@ function StudentForm({ studentData }) {
               </div>
             </div>
             <br></br> */}
-            <div className="form-floating">
+            {/* <div className="form-floating">
               <input
                 className={styles.formControl}
                 type="text"
@@ -728,14 +803,11 @@ function StudentForm({ studentData }) {
                 placeholder="Medium"
                 {...register("medium")}
               ></input>
-              {/* <label className="form-label" htmlFor="medium">
-                Medium
-              </label> */}
               <div className={styles.errorMessage}>
                 {errors.medium && <p>{errors.medium.message}</p>}
               </div>
             </div>
-            <br></br>
+            <br></br> */}
             {/* <div className="form-floating">
               <input
                 className={styles.formControl}
@@ -785,6 +857,7 @@ function StudentForm({ studentData }) {
           </Button>
         </div>
       </form>
+       )}
     </div>
   );
 }
diff --git a/packages/admin/src/components/StudentForm.module.css b/packages/admin/src/components/StudentForm.module.css
index 0b198125..56e3fa85 100644
--- a/packages/admin/src/components/StudentForm.module.css
+++ b/packages/admin/src/components/StudentForm.module.css
@@ -103,3 +103,13 @@
   gap: 25px;
   margin-top: 10px;
 }
+
+.loader {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100vh;
+  color: rgb(100, 97, 210);
+  font-size: 1.5rem;
+}
diff --git a/packages/admin/src/routes/links.jsx b/packages/admin/src/routes/links.jsx
index 101aaff9..c4479095 100644
--- a/packages/admin/src/routes/links.jsx
+++ b/packages/admin/src/routes/links.jsx
@@ -9,11 +9,11 @@ export const teacherBulk = baseLink + "/teacher/bulkupload";
 export const studentReset = baseLink + "/user/reset-password";
 export const studentSearch = baseLink + "/student/search";
 export const teacherSearch = baseLink + "/teacher/search";
-export const schoolSearch = baseLink + "/school/search";
-export const groupSearch = baseLink + "/group/search";       
+export const schoolSearch = baseLink + "/school/search";export const groupSearch = baseLink + "/group/search";
+
 // Add new endpoints
 export const getStateList = baseLink + "/student/getStatesList";
 export const getDistrictList = baseLink + "/student/getDistrictList";
 export const getBlockList = baseLink + "/student/getBlockList";
 export const getSchoolList = baseLink + "/student/getSchoolList";
-export const getClassList = baseLink + "/student/getClass";
+export const getClassList = baseLink + "/student/getClass";
\ No newline at end of file