diff --git a/Frontend/src/components/FileList.jsx b/Frontend/src/components/FileList.jsx
index 76e097b..268689f 100644
--- a/Frontend/src/components/FileList.jsx
+++ b/Frontend/src/components/FileList.jsx
@@ -2,6 +2,7 @@ import { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useDispatch, useSelector } from "react-redux";
 import { setCurrentPath } from "../store/pathSlice";
+import PasswordForDownload from "./PasswordForDownload";
 import {
   FileText,
   FileVideo,
@@ -20,16 +21,16 @@ import {
 
 const API_URL = import.meta.env.VITE_API_URL;
 
-const FileTable = ({ initialPath }) => {
-  // Read username dynamically to avoid stale null on first load
+const FileList = ({ initialPath }) => {
   const username = localStorage.getItem("username") || "";
   const userRoot = `/${username}`;
 
-  // Initialize currentPath only once with the correct userRoot
   const [currentPath, setCurrentPathState] = useState(
     () => initialPath || userRoot
   );
   const [files, setFiles] = useState([]);
+  const [showDownloadModal, setShowDownloadModal] = useState(false);
+  const [downloadFilename, setDownloadFilename] = useState("");
   const dispatch = useDispatch();
   const isUploading = useSelector((state) => state.upload.isUploading);
 
@@ -41,7 +42,6 @@ const FileTable = ({ initialPath }) => {
   const getIcon = (name, type) => {
     if (type === "Folder")
       return <Folder className="text-yellow-500 w-5 h-5 mr-2" />;
-
     const ext = name.split(".").pop().toLowerCase();
     switch (ext) {
       case "txt":
@@ -111,7 +111,6 @@ const FileTable = ({ initialPath }) => {
           : `${API_URL}/api/hdfs/deleteFolder?hdfsPath=${encodeURIComponent(
               hdfsPath
             )}`;
-
       const resp = await fetch(endpoint, { method: "DELETE" });
       if (!resp.ok) console.error("Deletion failed:", await resp.text());
       fetchFiles();
@@ -136,116 +135,103 @@ const FileTable = ({ initialPath }) => {
     setCurrentPathState(parts.length === 0 ? userRoot : `/${parts.join("/")}`);
   };
 
-  const handleFileDownload = async (hdfsPath, name, event) => {
-    event.stopPropagation();
-    try {
-      const authToken = localStorage.getItem("token");
-      const response = await fetch(
-        `${API_URL}/api/hdfs/downloadFile?hdfsEncPath=${encodeURIComponent(
-          hdfsPath
-        )}&localPath=${name}&username=${username}`,
-        {
-          method: "POST",
-          headers: { Authorization: `Bearer ${authToken}` },
-        }
-      );
-
-      if (!response.ok) throw new Error(await response.text());
-      const blob = await response.blob();
-      const url = window.URL.createObjectURL(blob);
-      const link = document.createElement("a");
-      link.href = url;
-      link.download = name;
-      document.body.appendChild(link);
-      link.click();
-      link.remove();
-      window.URL.revokeObjectURL(url);
-      fetchFiles();
-    } catch (error) {
-      console.error("Download failed:", error);
-      alert("Something went wrong while downloading the file.");
-    }
+  // open modal instead of direct download
+  const openDownloadModal = (name, e) => {
+    e.stopPropagation();
+    setDownloadFilename(name);
+    setShowDownloadModal(true);
   };
 
   return (
-    <div className="relative overflow-x-auto rounded-2xl shadow-lg border border-blue-200">
-      <div className="flex items-center justify-between px-6 py-4 bg-blue-100 text-black font-semibold text-sm">
-        <span className="truncate max-w-[80%]">Path: {currentPath}</span>
-        {currentPath !== userRoot && (
-          <button
-            onClick={goBack}
-            className="flex items-center gap-1 text-blue-600 hover:underline text-sm"
-          >
-            <ArrowLeft className="w-4 h-4" />
-            Go Back
-          </button>
-        )}
+    <>
+      <div className="relative overflow-x-auto rounded-2xl shadow-lg border border-blue-200">
+        <div className="flex items-center justify-between px-6 py-4 bg-blue-100 text-black font-semibold text-sm">
+          <span className="truncate max-w-[80%]">Path: {currentPath}</span>
+          {currentPath !== userRoot && (
+            <button
+              onClick={goBack}
+              className="flex items-center gap-1 text-blue-600 hover:underline text-sm"
+            >
+              <ArrowLeft className="w-4 h-4" />
+              Go Back
+            </button>
+          )}
+        </div>
+
+        <table className="w-full text-sm text-left text-black">
+          <thead className="text-xs uppercase bg-blue-50 text-blue-800 border-b border-blue-200">
+            <tr>
+              <th className="px-6 py-3">Name</th>
+              <th className="px-6 py-3">Actions</th>
+            </tr>
+          </thead>
+          <tbody>
+            {files.length === 0 ? (
+              <tr>
+                <td colSpan="2" className="px-6 py-4 text-gray-500 text-center">
+                  No files found.
+                </td>
+              </tr>
+            ) : (
+              files.map((entry, idx) => {
+                const name = getName(entry);
+                const type = getType(entry);
+                // const hdfsPath = `${currentPath}/${name}`;
+                return (
+                  <tr
+                    key={idx}
+                    onClick={
+                      type === "Folder"
+                        ? () => handleOpenFolder(name)
+                        : undefined
+                    }
+                    className={`even:bg-blue-50 odd:bg-white border-b border-blue-100 transition hover:bg-blue-100 ${
+                      type === "Folder" ? "cursor-pointer" : ""
+                    }`}
+                  >
+                    <td className="px-6 py-4 font-medium flex items-center">
+                      {getIcon(name, type)}
+                      {name}
+                    </td>
+                    <td className="px-6 py-4 space-x-3">
+                      {isFile(entry) && (
+                        <button
+                          onClick={(e) => openDownloadModal(name, e)}
+                          className="text-blue-600 hover:underline inline-flex items-center"
+                        >
+                          <Download className="w-4 h-4 mr-1" />
+                          Download
+                        </button>
+                      )}
+                      <button
+                        onClick={(e) => deleteFileOrFolder(name, type, e)}
+                        className="text-red-600 hover:underline inline-flex items-center"
+                      >
+                        <Trash2 className="w-4 h-4 mr-1" />
+                        Delete
+                      </button>
+                    </td>
+                  </tr>
+                );
+              })
+            )}
+          </tbody>
+        </table>
       </div>
 
-      <table className="w-full text-sm text-left text-black">
-        <thead className="text-xs uppercase bg-blue-50 text-blue-800 border-b border-blue-200">
-          <tr>
-            <th className="px-6 py-3">Name</th>
-            <th className="px-6 py-3">Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          {files.length === 0 ? (
-            <tr>
-              <td colSpan="2" className="px-6 py-4 text-gray-500 text-center">
-                No files found.
-              </td>
-            </tr>
-          ) : (
-            files.map((entry, idx) => {
-              const name = getName(entry);
-              const type = getType(entry);
-              const hdfsPath = `${currentPath}/${name}`;
-
-              return (
-                <tr
-                  key={idx}
-                  onClick={
-                    type === "Folder" ? () => handleOpenFolder(name) : undefined
-                  }
-                  className={`even:bg-blue-50 odd:bg-white border-b border-blue-100 transition hover:bg-blue-100 ${
-                    type === "Folder" ? "cursor-pointer" : ""
-                  }`}
-                >
-                  <td className="px-6 py-4 font-medium flex items-center">
-                    {getIcon(name, type)}
-                    {name}
-                  </td>
-                  <td className="px-6 py-4 space-x-3">
-                    {isFile(entry) && (
-                      <button
-                        onClick={(e) => handleFileDownload(hdfsPath, name, e)}
-                        className="text-blue-600 hover:underline inline-flex items-center"
-                      >
-                        <Download className="w-4 h-4 mr-1" />
-                        Download
-                      </button>
-                    )}
-                    <button
-                      onClick={(e) => deleteFileOrFolder(name, type, e)}
-                      className="text-red-600 hover:underline inline-flex items-center"
-                    >
-                      <Trash2 className="w-4 h-4 mr-1" />
-                      Delete
-                    </button>
-                  </td>
-                </tr>
-              );
-            })
-          )}
-        </tbody>
-      </table>
-    </div>
+      {showDownloadModal && (
+        <PasswordForDownload
+          filename={downloadFilename}
+          onDownload={fetchFiles}
+          onClose={() => setShowDownloadModal(false)}
+        />
+      )}
+    </>
   );
 };
 
-FileTable.propTypes = {
+FileList.propTypes = {
   initialPath: PropTypes.string,
 };
 
-export default FileTable;
+export default FileList;