diff --git a/src/app/actions/get-papers-by-id.ts b/src/app/actions/get-papers-by-id.ts
index 3f30051f..6909aa6d 100644
--- a/src/app/actions/get-papers-by-id.ts
+++ b/src/app/actions/get-papers-by-id.ts
@@ -1,20 +1,22 @@
-import { type PaperResponse } from "@/interface";
+import type { PaperResponse, ApiResponse } from "@/interface";
 import axios, { type AxiosResponse } from "axios";
 
 export const fetchPaperID = async (id: string): Promise<PaperResponse> => {
   const serverUrl = process.env.SERVER_URL ?? "https://papers.codechefvit.com";
 
   try {
-    const response: AxiosResponse<PaperResponse> = await axios.get(
+    const response: AxiosResponse<ApiResponse<PaperResponse>> = await axios.get(
       `${serverUrl}/api/paper-by-id/${id}`,
     );
-    return response.data;
+
+    if (!response.data.data) {
+      throw new Error("Paper not found");
+    }
+    return response.data.data;
   } catch (err: unknown) {
-    if (axios.isAxiosError(err)) {
-      console.error("Axios error:", err.response?.data ?? err.message);
-      const errorMessage =
-        (err.response?.data as { message?: string })?.message ??
-        "Failed to fetch paper";
+    if (axios.isAxiosError<ApiResponse<unknown>>(err)) {
+      const errorMessage = err.response?.data?.message ?? err.message;
+      console.error("Axios error:", errorMessage);
       throw new Error(errorMessage);
     } else {
       console.error("Unexpected error:", err);
diff --git a/src/app/api/course-list/route.ts b/src/app/api/course-list/route.ts
index 47bf19d7..f84f51f6 100644
--- a/src/app/api/course-list/route.ts
+++ b/src/app/api/course-list/route.ts
@@ -1,17 +1,14 @@
-import { NextResponse } from "next/server";
 import { getCourseList } from "@/lib/services/subject";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
 export async function GET() {
   try {
     const courses = await getCourseList();
-    return NextResponse.json(courses, { status: 200 });
+    return success(courses);
   } catch (error) {
     console.error(error);
-    return NextResponse.json(
-      { message: "Failed to fetch courses", error },
-      { status: 500 },
-    );
+    return failure("Failed to fetch courses", 500);
   }
 }
diff --git a/src/app/api/paper-by-id/[id]/route.ts b/src/app/api/paper-by-id/[id]/route.ts
index 5a69c287..28b88c4f 100644
--- a/src/app/api/paper-by-id/[id]/route.ts
+++ b/src/app/api/paper-by-id/[id]/route.ts
@@ -1,23 +1,21 @@
-import { NextResponse } from "next/server";
 import { Types } from "mongoose";
 import { getPaperById } from "@/lib/services/paper";
+import { success, failure } from "@/lib/utils/response"
+
+export const dynamic = "force-dynamic";
 
 export async function GET(req: Request, { params }: { params: { id: string } }) {
   try {
     const { id } = params;
     
     if (!Types.ObjectId.isValid(id)) {
-      return NextResponse.json({ message: "Invalid paper ID" }, { status: 400 });
+      return failure("Invalid paper ID");
     }
-
     const paper = await getPaperById(id);
-
-    return NextResponse.json(paper, { status: 200 });
+    
+    return success(paper);
   } catch (error) {
     console.error(error);
-    return NextResponse.json(
-      { message: "Failed to fetch paper", error },
-      { status: 500 },
-    );
+    return failure("Failed to fetch paper", 500);
   }
 }
diff --git a/src/app/api/papers/count/route.ts b/src/app/api/papers/count/route.ts
index cc2fbf1e..0bb50a57 100644
--- a/src/app/api/papers/count/route.ts
+++ b/src/app/api/papers/count/route.ts
@@ -1,17 +1,15 @@
-import { NextResponse } from "next/server";
 import { getCourseCounts } from "@/lib/services/paper";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
-export async function GET(req: Request) {
+export async function GET() {
   try {
     const courseCount = await getCourseCounts();
 
-    return NextResponse.json(courseCount, { status: 200 });
+    return success(courseCount);
   } catch (error) {
-    return NextResponse.json(
-      { message: "Failed to fetch course counts", error },
-      { status: 500 },
-    );
+    console.error(error);
+    return failure("Failed to fetch course counts", 500);
   }
 }
diff --git a/src/app/api/papers/route.ts b/src/app/api/papers/route.ts
index b7840ddb..a5eb23cb 100644
--- a/src/app/api/papers/route.ts
+++ b/src/app/api/papers/route.ts
@@ -1,5 +1,6 @@
-import { NextResponse, type NextRequest } from "next/server";
+import { type NextRequest } from "next/server";
 import { getPapersBySubject } from "@/lib/services/paper";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
@@ -8,18 +9,13 @@ export async function GET(req: NextRequest) {
     const url = req.nextUrl.searchParams;
     const sub = url.get("subject");
     if (!sub) {
-      return NextResponse.json(
-        { message: "Subject query parameter is required" },
-        { status: 400 },
-      );
+      return failure("Subject query parameter is required");
     }
     const paper = await getPapersBySubject(sub);
 
-    return NextResponse.json(paper, { status: 200 });
+    return success(paper);
   } catch (error) {
-    return NextResponse.json(
-      { message: "Failed to fetch papers", error },
-      { status: 500 },
-    );
+    console.error(error);
+    return failure("Failed to fetch papers", 500);
   }
 }
diff --git a/src/app/api/related-subject/route.ts b/src/app/api/related-subject/route.ts
index 6f374ff6..debd00dc 100644
--- a/src/app/api/related-subject/route.ts
+++ b/src/app/api/related-subject/route.ts
@@ -1,5 +1,6 @@
 import { getRelatedSubjects } from "@/lib/services/subject";
-import { NextResponse, type NextRequest } from "next/server";
+import { type NextRequest } from "next/server";
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
@@ -9,21 +10,13 @@ export async function GET(req: NextRequest) {
     const subject = url.get("subject");
 
     if (!subject) {
-      return NextResponse.json(
-        { message: "Subject query parameter is required" },
-        { status: 400 },
-      );
+      return failure("Subject query parameter is required", 400);
     }
     const relatedSubjects = await getRelatedSubjects(subject);
 
-    return NextResponse.json(
-      {related_subjects: relatedSubjects},
-      { status: 200 },
-    );
+    return success({ related_subjects: relatedSubjects });
   } catch (error) {
-    return NextResponse.json(
-      { message: "Failed to fetch related subject", error },
-      { status: 500 },
-    );
+    console.error(error);
+    return failure("Failed to fetch related subject", 500);
   }
 }
\ No newline at end of file
diff --git a/src/app/api/report-tag/route.ts b/src/app/api/report-tag/route.ts
index 032cbd15..23633e7a 100644
--- a/src/app/api/report-tag/route.ts
+++ b/src/app/api/report-tag/route.ts
@@ -1,6 +1,6 @@
-import { NextResponse } from "next/server";
-import { reportTag, ReportTagBody } from "@/lib/services/report";
+import { reportTag, type ReportTagBody } from "@/lib/services/report";
 import { rateLimitCheck } from "@/lib/utils/rate-limiter";
+import { success, failure } from "@/lib/utils/response";
 import { customErrorHandler } from "@/lib/utils/error";
 
 export async function POST(req: Request & { ip?: string }) {
@@ -9,18 +9,12 @@ export async function POST(req: Request & { ip?: string }) {
     const paperId = typeof body.paperId === "string" ? body.paperId : undefined;
 
     if (!paperId) {
-      return NextResponse.json(
-        { error: "paperId is required" },
-        { status: 400 }
-      );
+      return failure("paperId is required", 400);
     }
     await rateLimitCheck(req, paperId);
     const newReport = await reportTag(paperId, body);
 
-    return NextResponse.json(
-      { message: "Report submitted.", report: newReport },
-      { status: 201 }
-    );
+    return success({ message: "Report submitted.", report: newReport }, "Created", 201);
   } catch (err) {
     console.error(err);
     return customErrorHandler(err, "Failed to submit tag report.");
diff --git a/src/app/api/request/route.ts b/src/app/api/request/route.ts
index 48c93022..a0fbf2c6 100644
--- a/src/app/api/request/route.ts
+++ b/src/app/api/request/route.ts
@@ -1,36 +1,19 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import PaperRequest from "@/db/paperRequest";
+import { success, failure } from "@/lib/utils/response";
+import { createPaperRequest } from "@/lib/services/paper"
+import type { CreatePaperInputType } from "@/lib/services/paper"
 
 export async function POST(req: Request) {
   try {
-    await connectToDatabase();
-    const body = (await req.json()) as {
-      subject: string;
-      exam: string;
-      slot: string;
-      year: string;
-    };
-
-    const { subject, exam, slot, year } = body;
+    const {subject, exam, slot, year} = (await req.json()) as CreatePaperInputType
 
     if (!subject || !exam || !slot || !year) {
-      return NextResponse.json(
-        { error: "All fields are required." },
-        { status: 400 },
-      );
+      return failure("All fields are required.", 400);
     }
 
-    const newRequest = await PaperRequest.create({ subject, exam, slot, year });
-    return NextResponse.json(
-      { message: "Paper request submitted successfully!", request: newRequest },
-      { status: 201 },
-    );
+    const newRequest = await createPaperRequest({subject, exam, slot, year});
+    return success({ message: "Paper request submitted successfully!", request: newRequest }, "Created", 201);
   } catch (error) {
     console.error("Error creating paper request:", error);
-    return NextResponse.json(
-      { error: "Failed to submit request." },
-      { status: 500 },
-    );
+    return failure("Failed to submit request.", 500);
   }
 }
diff --git a/src/app/api/selected-papers/route.ts b/src/app/api/selected-papers/route.ts
index 5c822f6b..0a5a7a11 100644
--- a/src/app/api/selected-papers/route.ts
+++ b/src/app/api/selected-papers/route.ts
@@ -1,33 +1,18 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import Paper from "@/db/papers";
+import { success, failure } from "@/lib/utils/response";
+import { getSelectedPapers } from "@/lib/services/paper";
 
 export const dynamic = "force-dynamic";
 
 export async function GET() {
   try {
-    await connectToDatabase();
-
-    const selectedPapers = await Paper.find({ isSelected: true }).limit(8);
+    const selectedPapers = await getSelectedPapers();
 
     if (selectedPapers.length === 0) {
-      return NextResponse.json(
-        {
-          message: "No selected papers found.",
-        },
-        { status: 404 },
-      );
+      return failure("No selected papers found.", 404);
     }
-    return NextResponse.json(selectedPapers, {
-      status: 200,
-    });
+    return success(selectedPapers);
   } catch (error) {
     console.error("Error fetching papers:", error);
-    return NextResponse.json(
-      {
-        error: "Failed to fetch papers.",
-      },
-      { status: 500 },
-    );
+    return failure("Failed to fetch papers.", 500);
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/subscribe/route.ts b/src/app/api/subscribe/route.ts
index ce228186..791e7d31 100644
--- a/src/app/api/subscribe/route.ts
+++ b/src/app/api/subscribe/route.ts
@@ -1,19 +1,19 @@
-import { NextResponse } from "next/server";
-import { customErrorHandler } from "@/lib/utils/error";
 import { subscribeEmail } from "@/lib/services/subscribe";
+import { success, failure } from "@/lib/utils/response";
+import { customErrorHandler } from "@/lib/utils/error";
 
 export async function POST(req: Request) {
   try {
     const { email } = (await req.json()) as { email: string };
 
     if (!email) {
-      return NextResponse.json({ error: "Email is required" }, { status: 400 });
+      return failure("Email is required", 400);
     }
     await subscribeEmail(email);
 
-    return NextResponse.json({ message: "Email added successfully" });
+    return success({ message: "Email added successfully" });
   } catch (error) {
     console.error("Error adding email:", error);
     return customErrorHandler(error, "Failed to add email");
   }
-} 
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/app/api/upcoming-papers/route.ts b/src/app/api/upcoming-papers/route.ts
index 9c764280..96e81406 100644
--- a/src/app/api/upcoming-papers/route.ts
+++ b/src/app/api/upcoming-papers/route.ts
@@ -1,36 +1,19 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import UpcomingSubject from "@/db/upcoming-paper";
+import { success, failure } from "@/lib/utils/response";
+import { getUpcomingSubjects } from "@/lib/services/subject";
 
 export const dynamic = "force-dynamic";
 
 export async function GET() {
   try {
-    await connectToDatabase();
-    const selectedSubjects = await UpcomingSubject.find()
-      .sort({ _id: 1 })
-      .limit(16)
-      .lean();
-    
+    const selectedSubjects = await getUpcomingSubjects();
+
     if (selectedSubjects.length === 0) {
-      return NextResponse.json(
-        {
-          message: "No selected papers found.",
-        },
-        { status: 404 },
-      );
+      return failure("No selected papers found.", 404);
     }
 
-    return NextResponse.json(selectedSubjects, {
-      status: 200,
-    });
+    return success(selectedSubjects);
   } catch (error) {
     console.error("Error fetching papers:", error);
-    return NextResponse.json(
-      {
-        error: "Failed to fetch papers.",
-      },
-      { status: 500 },
-    );
+    return failure("Failed to fetch papers.", 500);
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/upload/route.ts b/src/app/api/upload/route.ts
index 2fad98e7..471b5cb0 100644
--- a/src/app/api/upload/route.ts
+++ b/src/app/api/upload/route.ts
@@ -1,71 +1,33 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import { PaperAdmin } from "@/db/papers";
-import { createPDFfromImages } from "@/lib/storage/pdf";
-import { uploadPDF, uploadThumbnail } from "@/lib/storage/gcp";
+import { success, failure } from "@/lib/utils/response";
+import { uploadPaper } from "@/lib/services/upload";
 
 export const runtime = "nodejs";
 
 export async function POST(req: Request) {
   try {
-    await connectToDatabase();
     const formData = await req.formData();
     const files = formData.getAll("files").filter(Boolean) as File[];
     const isPdf = formData.get("isPdf") === "true";
-    const thumb = formData.get("thumbnail") as File | null;
+    const thumbnail = formData.get("thumbnail") as File | null;
+    const campus = formData.get("campus") as string | null;
 
     if (files.length === 0) {
-      return NextResponse.json(
-        { error: "No files received." },
-        { status: 400 },
-      );
+      return failure("No files received.", 400);
     }
 
-    let pdfBytes: Uint8Array;
-    if (isPdf) {
-      if (!files[0]) {
-        return NextResponse.json(
-          { error: "No PDF file provided." },
-          { status: 400 },
-        );
-      }
-      pdfBytes = new Uint8Array(await files[0].arrayBuffer());
-    } else {
-      pdfBytes = await createPDFfromImages(files);
-    }
-
-    const buffer = Buffer.from(pdfBytes);
-
-    const file_url = await uploadPDF("unapproved", buffer);
+    const result = await uploadPaper({ files, isPdf, thumbnail, campus });
 
-    let thumbnail_url: string | null = null;
-    if (thumb) {
-      const thumbBuffer = Buffer.from(await thumb.arrayBuffer());
-      thumbnail_url = await uploadThumbnail(thumbBuffer, file_url);
+    if (!result.success) {
+      return failure(result.message, result.status);
     }
 
-    const paper = new PaperAdmin({
-      file_url,
-      thumbnail_url,
-      campus: formData.get("campus"),
-      subject: null,
-      slot: null,
-      year: null,
-      exam: null,
-      semester: null,
-      ambiguous_tags: [],
-    });
-    await paper.save();
-
-    return NextResponse.json(
-      { status: "success", file_url, thumbnail_url },
-      { status: 201 },
+    return success(
+      { file_url: result.file_url, thumbnail_url: result.thumbnail_url },
+      "Created",
+      201,
     );
   } catch (error) {
     console.error(error);
-    return NextResponse.json(
-      { message: "Failed to upload papers", error },
-      { status: 500 },
-    );
+    return failure("Failed to upload papers", 500);
   }
-}
+}
\ No newline at end of file
diff --git a/src/app/api/user-papers/route.ts b/src/app/api/user-papers/route.ts
index 8d2b9dfb..8473ff56 100644
--- a/src/app/api/user-papers/route.ts
+++ b/src/app/api/user-papers/route.ts
@@ -1,34 +1,18 @@
-import { NextResponse } from "next/server";
-import { connectToDatabase } from "@/lib/database/mongoose";
-import Paper from "@/db/papers";
-import { StoredSubjects } from "@/interface";
-import { transformPapersToSubjectSlots } from "@/lib/services/paper-transform";
+import { type StoredSubjects } from "@/interface";
+import { getPapersBySubjects } from "@/lib/services/paper"
+import { success, failure } from "@/lib/utils/response";
 
 export const dynamic = "force-dynamic";
 
 export async function POST(req: Request) {
   try {
-    await connectToDatabase();
     const subjects = (await req.json()) as StoredSubjects;
 
-    const usersPapers = await Paper.find({
-      subject: { $in: subjects },
-    });
+    const transformedPapers = await getPapersBySubjects(subjects)
 
-    console.log("Fetched user papers:", usersPapers);
-
-    const transformedPapers = transformPapersToSubjectSlots(usersPapers);
-
-    return NextResponse.json(transformedPapers, {
-      status: 200,
-    });
+    return success(transformedPapers);
   } catch (error) {
     console.error("Error fetching papers:", error);
-    return NextResponse.json(
-      {
-        error: "Failed to fetch papers.",
-      },
-      { status: 500 },
-    );
+    return failure("Failed to fetch papers.", 500);
   }
 }
diff --git a/src/app/pinned/page.tsx b/src/app/pinned/page.tsx
index 59d1eafd..7b0a8f92 100644
--- a/src/app/pinned/page.tsx
+++ b/src/app/pinned/page.tsx
@@ -1,6 +1,5 @@
 import React from "react";
 import SearchBar from "@/components/Searchbar/searchbar";
-import PinnedPapersCarousel from "@/components/PinnedPapersCarousel";
 
 const Pinned = () => {
   return (
diff --git a/src/app/request/page.tsx b/src/app/request/page.tsx
index 97367f6c..56ee4ee3 100644
--- a/src/app/request/page.tsx
+++ b/src/app/request/page.tsx
@@ -14,18 +14,12 @@ import { Input } from "@/components/ui/input";
 import axios from "axios";
 import Fuse from "fuse.js";
 import { type IUpcomingPaper } from "@/interface";
-import { Skeleton } from "../../components/ui/skeleton";
 import UpcomingPaper from "../../components/UpcomingPaper";
 import toast from "react-hot-toast";
 import { Search } from "lucide-react";
 import SkeletonPaperCard from "@/components/SkeletonPaperCard";
 import { useCourses } from "@/context/courseContext";
-
-type Course = {
-  name?: string | null;
-  courseName?: string | null;
-  title?: string | null;
-};
+import { type ApiResponse } from '@/interface'
 
 export default function PaperRequest() {
   const [subjects, setSubjects] = useState<string[]>([]);
@@ -38,7 +32,7 @@ export default function PaperRequest() {
   const suggestionsRef = useRef<HTMLUListElement | null>(null);
   const [displayPapers, setDisplayPapers] = useState<IUpcomingPaper[]>([]);
   const [isLoading, setIsLoading] = useState(true);
-  const { courses, loading, error, refetch } = useCourses();
+  const { courses } = useCourses();
 
   useEffect(() => {
     setSubjects(courses.map((course) => course.name));
@@ -48,11 +42,9 @@ export default function PaperRequest() {
     async function fetchPapers() {
       try {
         setIsLoading(true);
-        const response = await axios.get<IUpcomingPaper[]>(
-          "/api/upcoming-papers",
-        );
+        const response = await axios.get<ApiResponse<IUpcomingPaper[]>>("/api/upcoming-papers");
 
-        setDisplayPapers(response.data);
+        setDisplayPapers(response.data.data ?? []);
       } catch (error) {
         console.error("Failed to fetch papers:", error);
       } finally {
diff --git a/src/app/upload/page.tsx b/src/app/upload/page.tsx
index 18533bb4..4ff1347d 100644
--- a/src/app/upload/page.tsx
+++ b/src/app/upload/page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useState, useRef } from "react";
 import toast from "react-hot-toast";
 import { Button } from "@/components/ui/button";
 import axios, { AxiosError } from "axios";
@@ -13,7 +13,7 @@ import {
   TouchSensor,
   useSensor,
   useSensors,
-  DragEndEvent,
+  type DragEndEvent,
 } from "@dnd-kit/core";
 import {
   arrayMove,
@@ -24,16 +24,16 @@ import {
 import { CSS } from "@dnd-kit/utilities";
 import Dropzone from "react-dropzone";
 import { Upload, XIcon } from "lucide-react";
-import { getDocument, GlobalWorkerOptions } from "pdfjs-dist";
+import { GlobalWorkerOptions } from "pdfjs-dist";
+import type { ApiResponse } from "@/interface";
 
 GlobalWorkerOptions.workerSrc =
   "https://cdnjs.cloudflare.com/ajax/libs/pdf.js/4.8.69/pdf.worker.min.mjs";
 
-interface APIResponse {
-  status: string;
-  message?: string;
+interface uploadResponse {
+  file_url: string;
+  thumbnail_url: string;
 }
-
 export default function Page() {
   const campus = "Vellore";
   const [files, setFiles] = useState<File[]>([]);
@@ -44,6 +44,12 @@ export default function Page() {
   const [isGlobalDragging, setIsGlobalDragging] = useState(false);
   const [zoomIndex, setZoomIndex] = useState<number | null>(null);
 
+  const previewsRef = useRef(previews);
+
+  useEffect(() => {
+    previewsRef.current = previews;
+  }, [previews]);
+
   useEffect(() => {
     const onDragEnter = () => setIsGlobalDragging(true);
     const onDragLeave = () => setIsGlobalDragging(false);
@@ -63,7 +69,7 @@ export default function Page() {
   // Cleanup previews on unmount
   useEffect(() => {
     return () => {
-      previews.forEach((item) => {
+      previewsRef.current.forEach((item) => {
         try {
           URL.revokeObjectURL(item.preview);
         } catch {}
@@ -73,7 +79,6 @@ export default function Page() {
 
   const fileCheckAndSelect = useCallback(
     (acceptedFiles: File[]) => {
-      const maxFileSize = 5 * 1024 * 1024;
       const allowedFileTypes = [
         "application/pdf",
         "image/jpeg",
@@ -87,6 +92,16 @@ export default function Page() {
         return;
       }
 
+      const MAX_FILE_SIZE = 5 * 1024 * 1024;
+      const oversizedFiles = acceptedFiles.filter((file) => file.size > MAX_FILE_SIZE);
+      if (oversizedFiles.length > 0) {
+        toast.error(
+          `File "${oversizedFiles[0]?.name}" exceeds the 5 MB limit. Please select a file under 5 MB.`,
+          { id: toastId },
+        );
+        return;
+      }
+
       const isNewPdf = acceptedFiles.some(
         (file) => file.type === "application/pdf",
       );
@@ -131,28 +146,18 @@ export default function Page() {
       }
 
       const allFiles = [...files, ...acceptedFiles];
-      if (allFiles.length > 5) {
-        toast.error("You can upload up to 5 files only", { id: toastId });
-        return;
-      }
-
-      const totalSize = allFiles.reduce(
-        (sum, f) => sum + f.size,
-        0,
-      );
-      if (totalSize > maxFileSize){
-        toast.error("The total upload size exceeds 5MB.", { id: toastId });
+      if (allFiles.length > 10) {
+        toast.error("You can upload up to 10 files only", { id: toastId });
         return;
       }
 
       const invalidFiles = acceptedFiles.filter(
-        (file) =>
-          file.size > maxFileSize || !allowedFileTypes.includes(file.type),
+        (file) => !allowedFileTypes.includes(file.type),
       );
 
       if (invalidFiles.length > 0) {
         toast.error(
-          "Some files are invalid. Make sure the total size is below 5MB and files are of allowed types (PDF, JPEG, PNG, GIF).",
+          "Some files are invalid. Make sure they are PDFs, JPEGs, PNGs, or GIFs.",
           { id: toastId },
         );
         return;
@@ -273,13 +278,16 @@ export default function Page() {
       await toast.promise(
         async () => {
           try {
-            await axios.post<APIResponse>("/api/upload", formData);
+            await axios.post<ApiResponse<uploadResponse>>(
+              "/api/upload",
+              formData,
+            );
             return { message: "Papers uploaded successfully!" };
           } catch (error) {
-            if (error instanceof AxiosError && error.response?.data) {
-              const errorData = error.response.data as APIResponse;
+            if (error instanceof AxiosError) {
+              const errorData = error?.response?.data as ApiResponse<unknown>;
               const errorMessage =
-                errorData.message ?? "Failed to upload papers";
+                errorData?.message ?? "Failed to upload papers";
               throw new Error(errorMessage);
             }
             throw new Error("Failed to upload papers");
@@ -427,84 +435,102 @@ export default function Page() {
             </Dropzone>
           )}
           {previews.length > 0 && (
-            <section className="mt-6 flex w-full flex-col items-center">
-              <div className="flex w-max gap-4">
-                <div className="scrollbar-hide flex w-[80vw] max-w-4xl flex-col justify-between overflow-x-auto overflow-y-hidden rounded-[40px] border-[6px] border-[#A78BFA] bg-indigo-900/10 p-4 dark:border-indigo-900 sm:p-6 md:w-max md:p-8">
-                  <DndContext
-                    sensors={sensors}
-                    collisionDetection={closestCenter}
-                    onDragEnd={handleDndKitDragEnd}
+            <Dropzone
+              onDrop={onDrop}
+              accept={{
+                "image/*": [".jpeg", ".jpg", ".png", ".gif", ".bmp", ".webp"],
+                "application/pdf": [".pdf"],
+              }}
+              multiple={true}
+            >
+              {({ getRootProps, getInputProps }) => {
+                return (
+                  <section
+                    {...getRootProps()}
+                    className="mt-6 flex w-full flex-col items-center"
                   >
-                    <SortableContext
-                      items={previews.map((item) => item.id)}
-                      strategy={horizontalListSortingStrategy}
-                    >
-                      <div className="flex w-full snap-x snap-mandatory gap-3 sm:gap-4 md:gap-5">
-                        {previews.map((item, index) => (
-                          <SortablePreview key={item.id} id={item.id}>
-                            <div className="group relative w-full flex-shrink-0 snap-start sm:w-1/2 md:w-1/3 lg:w-1/4">
-                              <div className="relative h-64 w-48 overflow-hidden rounded-xl outline outline-2 outline-white sm:h-60">
-                                {/* Index badge */}
-                                <div className="absolute left-0 top-0 z-20 flex h-8 w-8 items-center justify-center rounded-br-xl rounded-tl-xl bg-slate-600 sm:h-10 sm:w-10">
-                                  <span className="text-sm font-bold text-white sm:text-xl">
-                                    {index + 1}
-                                  </span>
-                                </div>
-
-                                {/* Delete button */}
-                                <Button
-                                  onClick={(e) => {
-                                    e.preventDefault();
-                                    e.stopPropagation();
-                                    handleDelete(index);
-                                  }}
-                                  variant="destructive"
-                                  size="icon"
-                                  className="absolute right-0 top-0 z-20 h-8 w-8 rounded-bl-xl rounded-tr-xl bg-pink-800 hover:bg-red-900 sm:h-10 sm:w-10"
-                                  title="Delete"
-                                >
-                                  <FiTrash className="h-4 w-4 sm:h-5 sm:w-5" />
-                                </Button>
-
-                                {/* Preview */}
-                                <div className="absolute inset-0 z-10">
-                                  {item.file.type.startsWith("image/") ? (
-                                    <Image
-                                      src={item.preview}
-                                      alt={`Page ${index + 1}`}
-                                      fill
-                                      className="object-cover"
-                                      unoptimized
-                                    />
-                                  ) : (
-                                    <iframe
-                                      src={item.preview}
-                                      title={`PDF preview ${index + 1}`}
-                                      className="h-full w-full border-0"
-                                    />
-                                  )}
-                                </div>
-                              </div>
+                    <input {...getInputProps()} />
+                    <div className="flex w-max gap-4">
+                      <div className="scrollbar-hide flex w-[80vw] max-w-4xl flex-col justify-between overflow-x-auto overflow-y-hidden rounded-[40px] border-[6px] border-[#A78BFA] bg-indigo-900/10 p-4 dark:border-indigo-900 sm:p-6 md:w-max md:p-8">
+                        j
+                        <DndContext
+                          sensors={sensors}
+                          collisionDetection={closestCenter}
+                          onDragEnd={handleDndKitDragEnd}
+                        >
+                          <SortableContext
+                            items={previews.map((item) => item.id)}
+                            strategy={horizontalListSortingStrategy}
+                          >
+                            <div className="flex w-full snap-x snap-mandatory gap-3 sm:gap-4 md:gap-5">
+                              {previews.map((item, index) => (
+                                <SortablePreview key={item.id} id={item.id}>
+                                  <div className="group relative w-full flex-shrink-0 snap-start sm:w-1/2 md:w-1/3 lg:w-1/4">
+                                    <div className="relative h-64 w-48 overflow-hidden rounded-xl outline outline-2 outline-white sm:h-60">
+                                      {/* Index badge */}
+                                      <div className="absolute left-0 top-0 z-20 flex h-8 w-8 items-center justify-center rounded-br-xl rounded-tl-xl bg-slate-600 sm:h-10 sm:w-10">
+                                        <span className="text-sm font-bold text-white sm:text-xl">
+                                          {index + 1}
+                                        </span>
+                                      </div>
+
+                                      {/* Delete button */}
+                                      <Button
+                                        onClick={(e) => {
+                                          e.preventDefault();
+                                          e.stopPropagation();
+                                          handleDelete(index);
+                                        }}
+                                        variant="destructive"
+                                        size="icon"
+                                        className="absolute right-0 top-0 z-20 h-8 w-8 rounded-bl-xl rounded-tr-xl bg-pink-800 hover:bg-red-900 sm:h-10 sm:w-10"
+                                        title="Delete"
+                                      >
+                                        <FiTrash className="h-4 w-4 sm:h-5 sm:w-5" />
+                                      </Button>
+
+                                      {/* Preview */}
+                                      <div className="absolute inset-0 z-10">
+                                        {item.file.type.startsWith("image/") ? (
+                                          <Image
+                                            src={item.preview}
+                                            alt={`Page ${index + 1}`}
+                                            fill
+                                            className="object-cover"
+                                            unoptimized
+                                          />
+                                        ) : (
+                                          <iframe
+                                            src={item.preview}
+                                            title={`PDF preview ${index + 1}`}
+                                            className="h-full w-full border-0"
+                                          />
+                                        )}
+                                      </div>
+                                    </div>
+                                  </div>
+                                </SortablePreview>
+                              ))}
                             </div>
-                          </SortablePreview>
-                        ))}
-                      </div>
 
-                      {previews.length > 2 && (
-                        <div className="mt-3 text-center text-sm text-white/50">
-                          Swipe to view more &gt;&gt;
-                        </div>
-                      )}
-                    </SortableContext>
-                  </DndContext>
-                </div>
-              </div>
-              {previews.length > 1 && (
-                <div className="mt-4 text-right text-xl text-white/50">
-                  Drag to reorder
-                </div>
-              )}
-            </section>
+                            {previews.length > 2 && (
+                              <div className="mt-3 text-center text-sm text-white/50">
+                                Swipe to view more &gt;&gt;
+                              </div>
+                            )}
+                          </SortableContext>
+                        </DndContext>
+                      </div>
+                    </div>
+                    {previews.length > 1 && (
+                      <div className="mt-4 text-right text-xl text-white/50">
+                        Drag to reorder
+                      </div>
+                    )}
+                  </section>
+                );
+              }}
+            </Dropzone>
           )}
 
           <Button
diff --git a/src/components/CatalogueContent.tsx b/src/components/CatalogueContent.tsx
index df84ff6b..2dcde869 100644
--- a/src/components/CatalogueContent.tsx
+++ b/src/components/CatalogueContent.tsx
@@ -2,9 +2,9 @@
 
 import { useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
-import axios, { type AxiosError } from "axios";
+import axios from "axios";
 import { Button } from "@/components/ui/button";
-import { type IPaper, type Filters, type StoredSubjects } from "@/interface";
+import { type IPaper, type Filters, type StoredSubjects, type ApiResponse } from "@/interface";
 import Card from "./Card";
 import Loader from "./ui/loader";
 import SideBar from "../components/SideBar";
@@ -64,20 +64,17 @@ const CatalogueContentInner = ({ subject }: { subject: string | null }) => {
 
   useEffect(() => {
     setCurrentPage(1);
-  }, [subject]);
+  }, [subject, setCurrentPage]);
 
   // Fetch related subjects when subject changes
   useEffect(() => {
     if (!subject) return;
     const fetchRelatedSubjects = async () => {
       try {
-        const res = await axios.get<{ related_subjects: string[] }>(
-          "/api/related-subject",
-          {
-            params: { subject },
-          },
-        );
-        const data = res.data.related_subjects;
+        const res = await axios.get<ApiResponse<{ related_subjects: string[] }>>("/api/related-subject", {
+          params: { subject },
+        });
+        const data = res.data.data?.related_subjects;
         if (data && data.length > 0) {
           setRelatedSubjects(data);
         } else {
@@ -153,20 +150,23 @@ const CatalogueContentInner = ({ subject }: { subject: string | null }) => {
     const fetchPapers = async () => {
       setLoading(true);
       try {
-        const papersResponse = await axios.get<Filters>("/api/papers", {
-          params: { subject },
-        });
-        const data: Filters = papersResponse.data;
-        const papersData = data.papers;
+        const papersResponse = await axios.get<ApiResponse<Filters>>(
+          "/api/papers",
+          {
+            params: { subject },
+          },
+        );
+        
+        const data = papersResponse.data.data!;
+        const papersData = data?.papers ?? [];
         setFilterOptions(data);
         setPapers(papersData);
       } catch (error) {
         setPapers([]);
-        const axiosError = error as AxiosError;
+
         setError(
-          axios.isAxiosError(axiosError)
-            ? ((axiosError.response?.data as { message?: string })?.message ??
-                "Error fetching papers")
+          axios.isAxiosError<ApiResponse<never>>(error)
+            ? (error.response?.data.message ?? "Error fetching papers")
             : "Error fetching papers",
         );
       } finally {
diff --git a/src/components/FloatingNavbar.tsx b/src/components/FloatingNavbar.tsx
index eee4a1f8..f400825f 100644
--- a/src/components/FloatingNavbar.tsx
+++ b/src/components/FloatingNavbar.tsx
@@ -3,12 +3,7 @@
 import { usePathname } from "next/navigation";
 import Link from "next/link";
 import { useState } from "react";
-import {
-  ArrowUpRight,
-  ChevronDown,
-  Pin,
-  UploadIcon,
-} from "lucide-react";
+import { ChevronDown, UploadIcon } from "lucide-react";
 import ModeToggle from "./toggle-theme";
 
 import {
@@ -33,48 +28,52 @@ export default function FloatingNavbar({ onNavigate }: Props) {
       <DropdownMenu open={dropdownOpen} onOpenChange={setDropdownOpen}>
         <DropdownMenuTrigger asChild>
           <button
-            className="flex h-10 w-10 items-center justify-center rounded-full border border-[#3A3745] bg-[#e8e9ff] text-gray-700 hover:bg-slate-50 dark:bg-black dark:text-white dark:hover:bg-[#1A1823] shadow-lg transition-transform duration-200 hover:scale-105 active:scale-95 pointer-events-auto"
+            className="flex h-9 w-9 items-center justify-center rounded-full border border-[#3A3745] bg-[#e8e9ff] text-gray-700 hover:bg-slate-50 dark:bg-[#1E1B2E] dark:text-white dark:hover:bg-[#2A263D] shadow-lg transition-transform duration-200 hover:scale-105 active:scale-95 pointer-events-auto"
             aria-label="Toggle dropdown"
           >
             <ChevronDown
-              className={`h-5 w-5 transition-transform duration-200 ${dropdownOpen ? "rotate-180" : ""}`}
+              className={`h-4 w-4 transition-transform duration-200 ${dropdownOpen ? "rotate-180" : ""}`}
             />
           </button>
         </DropdownMenuTrigger>
 
         <DropdownMenuContent
-          className="xl:hidden mt-2 py-2 w-72 space-y-1 rounded-3xl 
-          border border-[#3A3745] shadow-lg backdrop-blur-sm transition-colors
-          bg-[#e8e9ff] text-gray-700 
-          dark:bg-black dark:text-white dark:border-[#3A3745]"
+          className="xl:hidden mt-2 p-1.5 w-48 space-y-0.5 rounded-xl 
+          border border-[#3A3745] shadow-xl backdrop-blur-md transition-colors
+          bg-[#e8e9ff] text-gray-800 
+          dark:bg-[#181528] dark:text-white dark:border-[#3A3745]"
           align="end"
         >
-          <DropdownMenuItem asChild>
+          <DropdownMenuItem asChild className="rounded-lg px-2.5 py-1.5 hover:bg-slate-200 dark:hover:bg-[#1F2A3D] dark:focus:bg-[#1F2A3D] cursor-pointer">
             <Link
               href={pathname === "/upload" ? "/" : "/upload"}
               onClick={() => onNavigate()}
-              className="flex w-full items-center gap-3 rounded-lg px-3 py-1 hover:bg-[#1A1823] transition"
+              className="flex w-full items-center gap-2.5 bg-transparent hover:bg-transparent"
             >
               <UploadIcon className="h-4 w-4" />
-              <span className="text-sm font-medium">
+              <span className="text-xs font-medium">
                 {pathname === "/upload" ? "Search Papers" : "Upload Papers"}
               </span>
             </Link>
           </DropdownMenuItem>
 
-          <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
-            <div className="flex w-full items-center gap-3 rounded-lg px-3 py-1 hover:bg-[#1A1823] transition">
-              <PinnedModal/>
-            </div>
+          <DropdownMenuItem
+            onSelect={(e) => e.preventDefault()}
+            className="rounded-lg px-2.5 py-1.5 hover:bg-slate-200 dark:hover:bg-[#1F2A3D] dark:focus:bg-[#1F2A3D] cursor-pointer"
+          >
+            <PinnedModal />
           </DropdownMenuItem>
 
-          <DropdownMenuItem asChild onSelect={(e) => e.preventDefault()}>
-            <div className="flex w-full items-center gap-3 rounded-lg px-3 py-1 hover:bg-[#1A1823] transition">
-              <RequestModal/>
-            </div>
+          <DropdownMenuItem
+            onSelect={(e) => e.preventDefault()}
+            className="rounded-lg px-2.5 py-1.5 hover:bg-slate-200 dark:hover:bg-[#1F2A3D] dark:focus:bg-[#1F2A3D] cursor-pointer"
+          >
+            <RequestModal />
           </DropdownMenuItem>
-          <div className="flex w-full items-center gap-3 rounded-lg px-3 py-1">
-            <div className="border rounded-full">
+
+          <div className="pt-1 mt-1 border-t border-gray-300 dark:border-[#2E2B3E] flex items-center justify-between px-2.5 py-1">
+            <span className="text-[11px] text-gray-500 dark:text-gray-400 font-medium">Theme</span>
+            <div className="border border-gray-300 dark:border-[#3A3745] rounded-full p-0.5 scale-90">
               <ModeToggle />
             </div>
           </div>
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index c59b7b47..945b0944 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -1,8 +1,7 @@
 "use client";
 
 import Link from "next/link";
-import { useTheme } from "next-themes";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { Button } from "./ui/button";
 import { Input } from "@/components/ui/input";
 import {
@@ -13,23 +12,12 @@ import {
   FaXTwitter,
   FaYoutube,
 } from "react-icons/fa6";
-import { Bold, Mail } from "lucide-react";
+import { Mail } from "lucide-react";
 import toast from "react-hot-toast";
-
-type SubscribeResponse = {
-  success?: boolean;
-  message?: string;
-};
+import type { ApiResponse } from '@/interface'
 
 export default function Footer() {
-  const { theme } = useTheme();
-  const [isDarkMode, setIsDarkMode] = useState<boolean | null>(true);
   const [email, setEmail] = useState("");
-  useEffect(() => {
-    if (theme) {
-      setIsDarkMode(theme === "dark");
-    }
-  }, [theme]);
   const handleSubscribe = async () => {
     if (!email.trim()) {
       toast.error("Please enter your email.");
@@ -43,7 +31,7 @@ export default function Footer() {
         body: JSON.stringify({ email }),
       })     
       .then(async (res) => {
-        const data = (await res.json()) as SubscribeResponse;
+        const data = (await res.json()) as ApiResponse<never>;
         if (!res.ok) throw new Error(data.message ?? "Something went wrong.");
         return data;
       }),
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index d22fdf58..27f56e69 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -1,22 +1,18 @@
 "use client";
 
 import { useState, useEffect } from "react";
-import Image, { StaticImageData } from "next/image";
+import Image, { type StaticImageData } from "next/image";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
 import ccLogo from "../assets/codechef_logo.svg";
 import ModeToggle from "@/components/toggle-theme";
 import {
   ArrowDownLeftIcon,
-  Pin,
-  ArrowUpRight,
   ChevronDown,
 } from "lucide-react";
 import FloatingNavbar from "./FloatingNavbar";
 import PWAInstallButton from "./ui/PWAInstallButton";
 import SearchBarChild from "./Searchbar/searchbar-child";
-import Banner from "@/components/ui/banners/bannerDismiss";
-import type { ICourses } from "@/interface";
 import {
   DropdownMenu,
   DropdownMenuTrigger,
@@ -32,7 +28,7 @@ function Navbar() {
   const pathname: string = usePathname() ?? "/";
 
   const [dropdownOpen, setDropdownOpen] = useState<boolean>(false);
-  const { courses, loading, error, refetch } = useCourses();
+  const { courses } = useCourses();
 
   useEffect(() => {
     if (pathname !== "/catalogue") return;
diff --git a/src/components/PapersCarousel.tsx b/src/components/PapersCarousel.tsx
index 3fd4a01c..83081d69 100644
--- a/src/components/PapersCarousel.tsx
+++ b/src/components/PapersCarousel.tsx
@@ -13,8 +13,8 @@ import {
 } from "@/components/ui/carousel";
 import Autoplay from "embla-carousel-autoplay";
 import { chunkArray } from "@/lib/utils/array";
-import { Skeleton } from "@/components/ui/skeleton";
 import SkeletonPaperCard from "@/components/SkeletonPaperCard";
+import { type ApiResponse } from "@/interface"
 
 function PapersCarousel() {
   const [displayPapers, setDisplayPapers] = useState<IUpcomingPaper[]>([]);
@@ -41,10 +41,8 @@ function PapersCarousel() {
     const fetchPapers = async () => {
       try {
         setIsLoading(true);
-        const response = await axios.get<IUpcomingPaper[]>(
-          "/api/upcoming-papers",
-        );
-        setDisplayPapers(response.data);
+        const response = await axios.get<ApiResponse<IUpcomingPaper[]>>("/api/upcoming-papers");
+        setDisplayPapers(response.data.data ?? []);
       } catch (error) {
         console.error("Failed to fetch papers:", error);
       } finally {
diff --git a/src/components/PinnedPapersCarousel.tsx b/src/components/PinnedPapersCarousel.tsx
index ec90d283..be9f72e6 100644
--- a/src/components/PinnedPapersCarousel.tsx
+++ b/src/components/PinnedPapersCarousel.tsx
@@ -16,6 +16,12 @@ import { chunkArray } from "@/lib/utils/array";
 import { type StoredSubjects } from "@/interface";
 import SkeletonPaperCard from "./SkeletonPaperCard";
 import PinnedModal from "./ui/PinnedModal";
+import { type ApiResponse } from "@/interface"
+
+interface userPaperResponse {
+  subject: string;
+  slots: string[]
+}
 
 function PinnedPapersCarousel() {
   const [isLoading, setIsLoading] = useState(true);
@@ -61,12 +67,12 @@ function PinnedPapersCarousel() {
         localStorage.getItem("userSubjects") ?? "[]",
       ) as StoredSubjects;
 
-      const response = await axios.post<{ subject: string; slots: string[] }[]>(
+      const response = await axios.post<ApiResponse<userPaperResponse[]>>(
         "/api/user-papers",
         storedSubjects,
       );
 
-      const fetchedPapers = response.data;
+      const fetchedPapers = response.data.data!;
 
       const fetchedSubjectsSet = new Set(
         fetchedPapers.map((paper) => paper.subject),
@@ -114,11 +120,9 @@ function PinnedPapersCarousel() {
             localStorage.getItem("userSubjects") ?? "[]",
           ) as StoredSubjects;
 
-          const response = await axios.post<
-            { subject: string; slots: string[] }[]
-          >("/api/user-papers", storedSubjects);
+          const response = await axios.post<ApiResponse<userPaperResponse[]>>("/api/user-papers", storedSubjects);
 
-          const fetchedPapers = response.data;
+          const fetchedPapers = response.data.data!;
 
           const fetchedSubjectsSet = new Set(
             fetchedPapers.map((paper) => paper.subject),
diff --git a/src/components/RelatedPaper.tsx b/src/components/RelatedPaper.tsx
index 447be7c9..7085be82 100644
--- a/src/components/RelatedPaper.tsx
+++ b/src/components/RelatedPaper.tsx
@@ -8,6 +8,7 @@ import { type IPaper, type Filters } from "@/interface";
 import Card from "@/components/Card";
 import Loader from "@/components/ui/loader";
 import { Button } from "./ui/button";
+import { type ApiResponse } from "@/interface"
 
 const RelatedPapers = () => {
   const params = useParams();
@@ -20,15 +21,21 @@ const RelatedPapers = () => {
   useEffect(() => {
     const fetchData = async () => {
       try {
-        const getpaper = await axios.get<IPaper>(`/api/paper-by-id/${id}`);
-        const paper = getpaper.data;
+        const getpaper = await axios.get<ApiResponse<IPaper>>(`/api/paper-by-id/${id}`);
+        if (!getpaper.data.data) {
+          throw new Error("Paper not found");
+        }
+        const paper = getpaper.data.data;
         setCurrentPaper(paper);
 
-        const allPapersBySubject = await axios.get<Filters>("/api/papers", {
-          params: { subject: paper.subject },
-        });
+        const allPapersBySubject = await axios.get<ApiResponse<Filters>>(
+          "/api/papers",
+          {
+            params: { subject: paper.subject },
+          },
+        );
 
-        const all = allPapersBySubject.data.papers;
+        const all = allPapersBySubject.data.data?.papers ?? [];
 
         const sameExam = all
           .filter((p) => p._id !== paper._id && p.exam === paper.exam)
diff --git a/src/components/ReportTagModal.tsx b/src/components/ReportTagModal.tsx
index 91c31e2c..f056f498 100644
--- a/src/components/ReportTagModal.tsx
+++ b/src/components/ReportTagModal.tsx
@@ -14,10 +14,11 @@ import { Button } from "@/components/ui/button";
 import { MultiSelect } from "@/components/multi-select";
 import LabeledInput from "@/components/ui/LabeledInput";
 import LabeledSelect from "@/components/ui/LabeledSelect";
-import axios, { AxiosError } from "axios";
+import axios from "axios";
 import toast from "react-hot-toast";  
+import { type ApiResponse } from '@/interface'
 
-type ReportResponse = { error?: string; message?: string };
+type ReportResponse = ApiResponse<{ error?: string; message?: string }>;
 
 interface ReportTagModalProps {
   paperId: string;
@@ -53,7 +54,6 @@ const ReportTagModal = ({
   const [originalCategoryValues, setOriginalCategoryValues] = useState<
     Record<string, string>
   >({});
-  const [originalEmail, setOriginalEmail] = useState("");
   const [loading, setLoading] = useState(false);
 
   const SCROLL_THRESHOLD = 4;
@@ -101,7 +101,7 @@ const ReportTagModal = ({
       else if (c === "year" && year)
         setCategoryValues((s) => ({ ...s, [c]: year }));
     }
-  }, [selectedCategories, subject, exam, slot, year]);
+  }, [selectedCategories, subject, exam, slot, year, categoryValues]);
 
   useEffect(() => {
     if (open) {
@@ -120,14 +120,12 @@ const ReportTagModal = ({
       if (slot) base.slot = slot;
       if (year) base.year = year;
       setOriginalCategoryValues(base);
-      setOriginalEmail("");
     } else {
       setSelectedCategories([]);
       setCategoryValues({});
       setComment("");
       setEmail("");
       setOriginalCategoryValues({});
-      setOriginalEmail("");
     }
   }, [open, subject, exam, slot, year]);
 
diff --git a/src/components/Searchbar/pinned-searchbar.tsx b/src/components/Searchbar/pinned-searchbar.tsx
index 76d3b36b..f70f3b4d 100644
--- a/src/components/Searchbar/pinned-searchbar.tsx
+++ b/src/components/Searchbar/pinned-searchbar.tsx
@@ -2,7 +2,6 @@
 
 import { useState, useRef, useEffect } from "react";
 import { Search } from "lucide-react";
-import { useRouter } from "next/navigation";
 import { Input } from "@/components/ui/input";
 import PinButton from "../PinButton";
 import Fuse from "fuse.js";
@@ -11,7 +10,6 @@ import { type StoredSubjects, type ICourseWithCount, type IUpcomingPaper } from
 function PinnedSearchBar({
   initialSubjects,
   setDisplayPapers,
-  displayPapers,
   filtersNotPulled,
 }: {
   initialSubjects: ICourseWithCount[];
@@ -19,7 +17,6 @@ function PinnedSearchBar({
   displayPapers : IUpcomingPaper[];
   filtersNotPulled?: () => void;
 }) {
-  const router = useRouter();
   const [searchText, setSearchText] = useState("");
   const [suggestions, setSuggestions] = useState<string[]>([]);
   const suggestionsRef = useRef<HTMLUListElement | null>(null);
@@ -154,11 +151,6 @@ function PinnedSearchBar({
     };
   }, []);
 
-  const handleRemoveAll = () => {
-    localStorage.setItem("userSubjects", JSON.stringify([]));
-    window.dispatchEvent(new Event("userSubjectsChanged"));
-  };
-
   useEffect(() => {
     const storedSubjects = JSON.parse(
       localStorage.getItem("userSubjects") ?? "[]",
diff --git a/src/components/Searchbar/searchbar-child.tsx b/src/components/Searchbar/searchbar-child.tsx
index 92dd261a..f6170d3c 100644
--- a/src/components/Searchbar/searchbar-child.tsx
+++ b/src/components/Searchbar/searchbar-child.tsx
@@ -5,7 +5,7 @@ import { Search } from "lucide-react";
 import { useRouter } from "next/navigation";
 import { Input } from "@/components/ui/input";
 import Fuse from "fuse.js";
-import { ICourseWithCount } from "@/interface";
+import { type ICourseWithCount } from "@/interface";
 
 function SearchBarChild({
   initialSubjects,
@@ -171,14 +171,14 @@ function SearchBarChild({
                 >
                   <div
                     id="paper_count"
-                    className="mr-4 flex h-8 w-8 items-center justify-center rounded-md bg-[#171720] text-xs font-semibold text-white"
+                    className="mr-4 flex h-8 w-8 shrink-0 items-center justify-center rounded-md bg-[#171720] text-xs font-semibold text-white"
                   >
                     {suggestion.count}
                   </div>
 
                   <span
                     id="subject"
-                    className="items-center text-sm tracking-wide text-black dark:text-white sm:text-base"
+                    className="flex-1 min-w-0 flex items-center text-sm tracking-wide text-black dark:text-white sm:text-base"
                   >
                     {(() => {
                       const codeMatch = /\[[^\]]+\]$/.exec(suggestion.name);
diff --git a/src/components/Searchbar/searchbar.tsx b/src/components/Searchbar/searchbar.tsx
index 35b30f00..4311147d 100644
--- a/src/components/Searchbar/searchbar.tsx
+++ b/src/components/Searchbar/searchbar.tsx
@@ -15,7 +15,7 @@ export default function SearchBar({
   displayPapers?:IUpcomingPaper[]
   setDisplayPapers?: React.Dispatch<React.SetStateAction<IUpcomingPaper[]>> 
 }) {
-  const { courses, loading, error, refetch } = useCourses();
+  const { courses } = useCourses();
 
   return type === "pinned" && setDisplayPapers !== undefined && displayPapers !== undefined ? (
     <PinnedSearchBar initialSubjects={courses} setDisplayPapers={setDisplayPapers} displayPapers={displayPapers} />
diff --git a/src/components/ShareButton.tsx b/src/components/ShareButton.tsx
index e06c7a65..d9387b77 100644
--- a/src/components/ShareButton.tsx
+++ b/src/components/ShareButton.tsx
@@ -3,11 +3,11 @@
 import React, { useEffect, useState } from "react";
 import {
   Dialog,
-  DialogContent,
   DialogDescription,
   DialogHeader,
   DialogTitle,
   DialogTrigger,
+  DialogContent,
 } from "./ui/dialog";
 import { Copy } from "lucide-react";
 import toast from "react-hot-toast";
@@ -16,25 +16,34 @@ import QR from "./qr";
 import { Button } from "./ui/button";
 import { usePathname } from "next/navigation";
 
-export default function ShareButton() {
+interface ShareButtonProps {
+  isFullscreen: boolean;
+  viewerRef: React.RefObject<HTMLDivElement>;
+}
+
+export default function ShareButton({ isFullscreen, viewerRef }: ShareButtonProps) {
   const [origin, setOrigin] = useState("");
+  const pathname = usePathname();
 
   useEffect(() => {
-    if (typeof window !== "undefined") {
-      setOrigin(window.location.origin);
-    }
+    setOrigin(window.location.origin);
   }, []);
 
-  const pathname = usePathname();
   const paperPath = origin + pathname;
   return (
     <Dialog>
       <DialogTrigger asChild>
-        <Button className="aspect-square h-10 w-10 p-0 rounded text-white bg-[#6536c1] transition hover:bg-[#7d4fc7]" title="Share this paper">
+        <Button
+          className="aspect-square h-10 w-10 p-0 rounded text-white bg-[#6536c1] transition hover:bg-[#7d4fc7]"
+          title="Share this paper"
+        >
           <FaShare />
         </Button>
       </DialogTrigger>
-      <DialogContent className="max-w-96">
+      <DialogContent
+        container={isFullscreen ? viewerRef.current : document.body}
+        className="max-w-96"
+      >
         <DialogHeader>
           <DialogTitle>Share Papers with your friends!</DialogTitle>
           <DialogDescription>
@@ -42,21 +51,18 @@ export default function ShareButton() {
           </DialogDescription>
         </DialogHeader>
         <div className="flex flex-col items-center justify-center gap-5">
-          <QR url={paperPath}></QR>
+          <QR url={paperPath} />
           <Button
-            type="submit"
+            type="button"
             size="sm"
             className="flex w-fit items-center justify-between gap-5 px-3"
             title="Copy link to clipboard"
             onClick={async () => {
-              await toast.promise(
-                navigator.clipboard.writeText(paperPath), // This is a promise
-                {
-                  success: "Link copied successfully",
-                  loading: "Copying link...",
-                  error: "Error copying link",
-                },
-              );
+              await toast.promise(navigator.clipboard.writeText(paperPath), {
+                success: "Link copied successfully",
+                loading: "Copying link...",
+                error: "Error copying link",
+              });
             }}
           >
             <p>Copy Link To Clipboard</p>
@@ -66,4 +72,4 @@ export default function ShareButton() {
       </DialogContent>
     </Dialog>
   );
-}
+}
\ No newline at end of file
diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index a3b535b8..486aadda 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -100,7 +100,9 @@ function SideBar() {
   ];
 
   return (
-    <div className="no-scrollbar sticky top-0 h-[100vh] flex-col items-baseline overflow-y-auto border-r-2 border-[#36266d] bg-[#f3f5ff] pt-[10px] dark:bg-[#070114] md:flex">
+    <div
+  className="no-scrollbar sticky top-[92px] md:top-[100px] h-[calc(100vh-92px)] md:h-[calc(100vh-100px)] flex-col items-baseline overflow-y-auto border-r-2 border-[#36266d] bg-[#f3f5ff] pt-[10px] dark:bg-[#070114] md:flex"
+>
       <div className="flex w-full items-center justify-between border-b-2 border-[#36266d] px-[10px] py-4">
         <div className="flex items-center gap-1">
           <Filter size={24} />
diff --git a/src/components/UpcomingPaper.tsx b/src/components/UpcomingPaper.tsx
index 275fb0b4..b5cba19c 100644
--- a/src/components/UpcomingPaper.tsx
+++ b/src/components/UpcomingPaper.tsx
@@ -5,8 +5,8 @@ import {
 
 import { useRouter } from "next/navigation";
 import { Pin } from "lucide-react";
-import React, { useContext, useEffect, useState } from "react";
-import { StoredSubjects } from "@/interface";
+import React, { useEffect, useState } from "react";
+import { type StoredSubjects } from "@/interface";
 import { useCourses } from "@/context/courseContext";
 import { Capsule } from "@/components/ui/capsule";
 
@@ -18,7 +18,7 @@ interface PaperCardProps {
 export default function PaperCard({ subject, slots }: PaperCardProps) {
   const courseName = extractWithoutBracketContent(subject);
   const courseCode = extractBracketContent(subject);
-  const { courses, loading, error, refetch } = useCourses();
+  const { courses } = useCourses();
   const [pinned, setPinned] = useState<boolean>(false);
   const [paperCount, setPaperCount] = useState<number>(0);
 
@@ -54,7 +54,7 @@ export default function PaperCard({ subject, slots }: PaperCardProps) {
     } else {
       setPaperCount(0);
     }
-  }, [subject, courseName]);
+  }, [subject, courseName, courses]);
 
   const router = useRouter();
   return (
diff --git a/src/components/multi-select.tsx b/src/components/multi-select.tsx
index ae11f1bb..ac493390 100644
--- a/src/components/multi-select.tsx
+++ b/src/components/multi-select.tsx
@@ -130,7 +130,6 @@ export const MultiSelect = React.forwardRef<
       animation = 0,
       maxCount = 3,
       modalPopover = false,
-      asChild = false,
       className,
       ...props
     },
diff --git a/src/components/newPdfViewer.tsx b/src/components/newPdfViewer.tsx
index a2c47ab8..61895ba8 100644
--- a/src/components/newPdfViewer.tsx
+++ b/src/components/newPdfViewer.tsx
@@ -3,7 +3,7 @@ import { createPluginRegistration } from '@embedpdf/core';
 import { EmbedPDF }                 from '@embedpdf/core/react';
 import { usePdfiumEngine }          from '@embedpdf/engines/react';
 import { Viewport, ViewportPluginPackage }               from '@embedpdf/plugin-viewport/react';
-import { useScroll, Scroller, ScrollPluginPackage }      from '@embedpdf/plugin-scroll/react';
+import { useScroll, useScrollCapability, Scroller, ScrollPluginPackage } from '@embedpdf/plugin-scroll/react';
 import { DocumentContent, DocumentManagerPluginPackage } from '@embedpdf/plugin-document-manager/react';
 import { useZoom, ZoomPluginPackage, ZoomMode }          from '@embedpdf/plugin-zoom/react';
 import { RenderLayer, RenderPluginPackage }              from '@embedpdf/plugin-render/react';
@@ -25,6 +25,7 @@ interface ControlProps {
   forceMobile?: boolean;
   isMobile: boolean;
   isSmall: boolean;
+  viewerRef: React.RefObject<HTMLDivElement>;
 }
 
 interface PdfViewerProps {
@@ -57,29 +58,54 @@ function useBreakpoint() {
 }
 
 const Controls = memo(function Controls({documentId, toggleFullscreen, isFullscreen, onDownload,
-  forceMobile, isMobile, isSmall}: ControlProps) {
+  forceMobile, isMobile, isSmall, viewerRef}: ControlProps) {
 
   const { provides: zoomProv, state: zoomState } = useZoom(documentId);
   const { provides: scrollProv, state: scrollState } = useScroll(documentId);
+  const { provides: scrollCapability } = useScrollCapability();
   const [pageNo, setPageNo] = useState("1");
+  const [totalPages, setTotalPages] = useState(0);
+  const editingRef = useRef(false);
+
+  useEffect(() => {
+    if (!scrollCapability) return;
+    const unsub = scrollCapability.onLayoutReady((event) => {
+      if (event.documentId === documentId) {
+        setTotalPages(event.totalPages);
+      }
+    });
+    return () => {
+      unsub();
+      setTotalPages(0);
+    };
+  }, [scrollCapability, documentId]);
 
   useEffect(() => {
     if (!scrollProv) return;
-    const unsub = scrollProv.onPageChange(() =>
-      setPageNo(String(scrollProv.getCurrentPage()))
-    );
+    const unsub = scrollProv.onPageChange((event) => {
+      setTotalPages(event.totalPages);
+      if (!editingRef.current) {
+        setPageNo(String(event.pageNumber));
+      }
+    });
     return () => unsub();
   }, [scrollProv]);
-
-  const pageChange = useCallback(
+  
+  const effectiveTotalPages =
+    totalPages > 0 ? totalPages : (scrollState?.totalPages ?? 0);
+  
+const pageChange = useCallback(
     (e: React.KeyboardEvent<HTMLInputElement>) => {
       if (e.key !== "Enter") return;
       const page = parseInt(pageNo, 10);
-      if (!isNaN(page) && page >= 1 && page <= (scrollState?.totalPages ?? 1)) {
+      if (isNaN(page)) return;
+      if (page >= 1 && page <= effectiveTotalPages) {
         scrollProv?.scrollToPage({ pageNumber: page, behavior: "smooth" });
+      } else {
+        setPageNo(String(scrollProv?.getCurrentPage() ?? 1));
       }
     },
-    [pageNo, scrollState?.totalPages, scrollProv]
+    [pageNo, effectiveTotalPages, scrollProv]
   );
 
   if (!zoomProv || !scrollProv) return null;
@@ -87,8 +113,6 @@ const Controls = memo(function Controls({documentId, toggleFullscreen, isFullscr
   const zoomIn = () => zoomProv.zoomIn();
   const zoomOut = () => zoomProv.zoomOut();
   const { zoomLevel } = zoomState;
-  const { totalPages } = scrollState;
-  
   const fullScreenStyle = {
     bottom: 20,
     left: "50%",
@@ -100,9 +124,20 @@ const Controls = memo(function Controls({documentId, toggleFullscreen, isFullscr
         <input
           type="text"
           value={pageNo}
-          onChange={(e) => setPageNo(e.target.value)}
+          onChange={(e) => {
+            editingRef.current = true;
+            setPageNo(e.target.value.replace(/[^0-9]/g, ""));
+          }}
           onKeyDown={pageChange}
-          onFocus={() => setPageNo("")}
+          onFocus={(e) => {
+            editingRef.current = true;
+            e.target.select();
+          }}
+          onBlur={() => {
+            editingRef.current = false;
+            setPageNo(String(scrollProv?.getCurrentPage() ?? 1));
+          }}
+          inputMode="numeric"
           className="h-9 w-14 rounded border bg-[#e7e9ff] p-1 text-center text-sm [appearance:textfield] dark:bg-[#1f1f2a] [&::-webkit-inner-spin-button]:appearance-none [&::-webkit-outer-spin-button]:appearance-none"
         />
         <span className="text-xs font-medium text-white">of {totalPages ?? 1}</span>
@@ -127,7 +162,7 @@ const Controls = memo(function Controls({documentId, toggleFullscreen, isFullscr
         <Download size={24} />
       </Button>
 
-      <ShareButton />
+      <ShareButton isFullscreen={isFullscreen} viewerRef={viewerRef} />
 
       <Button
         onClick={zoomOut}
@@ -139,7 +174,7 @@ const Controls = memo(function Controls({documentId, toggleFullscreen, isFullscr
       </Button>
 
       <span className="text-xs text-[16.5px] py-2 text-white font-small bg-[#262635] rounded px-1">
-        {typeof zoomLevel === "number" && `${Math.round(zoomLevel * 100)}%`}
+        {typeof zoomLevel === "number" ? `${Math.round(zoomLevel * 100)}%` : "100%"}
       </span>
 
       <Button
@@ -310,7 +345,7 @@ function WheelZoom({ documentId, viewerRef }: WheelZoomProps) {
       viewer.removeEventListener("wheel", handleWheel);
       if (rafId.current !== null) cancelAnimationFrame(rafId.current);
     };
-  }, [handleWheel]);
+  }, [handleWheel, viewerRef]);
 
   return null;
 }
@@ -492,47 +527,48 @@ if (isLoading || !engine) {
                 forceMobile={true}
                 isMobile={isMobile}
                 isSmall={isSmall}
+                viewerRef={viewerRef}
               />}
               <DocumentContent documentId={activeDocumentId}>
-            {({ isLoaded }) => (
-              <>
-                <div
-            className="absolute inset-0 z-50 flex items-center justify-center bg-[#070114]"
-            style={{
-            opacity: isLoaded ? 0 : 1,
-            pointerEvents: isLoaded ? "none" : "auto",
-            transition: "opacity 0.3s",
-            backgroundColor: effectiveBackgroundColor,
-          }}
-          >
-            <Loader
-              backgroundColor={effectiveBackgroundColor}
-              textColor={loaderTextColor}
-            />
-          </div>
-      <Viewport
-        documentId={activeDocumentId}
-        style={{
-          backgroundColor: effectiveBackgroundColor,
-          visibility: isLoaded ? "visible" : "hidden",
-        }}
-      >
-        <Scroller
-          documentId={activeDocumentId}
-          renderPage={({ width, height, pageIndex }) => (
-            <div
-              style={{ width, height }}
-              onClick={(e) => e.stopPropagation()}
-            >
-              <RenderLayer documentId={activeDocumentId} pageIndex={pageIndex} />
-            </div>
-          )}
-        />
-      </Viewport>
-    </>
-  )}
-</DocumentContent>
-              
+                {({ isLoaded }) => (
+                  <>
+                    <div
+                      className="absolute inset-0 z-50 flex items-center justify-center bg-[#070114]"
+                      style={{
+                      opacity: isLoaded ? 0 : 1,
+                      pointerEvents: isLoaded ? "none" : "auto",
+                      transition: "opacity 0.3s",
+                      backgroundColor: effectiveBackgroundColor,
+                      }}
+                    >
+                      <Loader
+                        backgroundColor={effectiveBackgroundColor}
+                        textColor={loaderTextColor}
+                      />
+                    </div>
+                    <Viewport
+                      documentId={activeDocumentId}
+                      style={{
+                        backgroundColor: effectiveBackgroundColor,
+                        visibility: isLoaded ? "visible" : "hidden",
+                      }}
+                    >
+                      <Scroller
+                        documentId={activeDocumentId}
+                        renderPage={({ width, height, pageIndex }) => (
+                          <div
+                            style={{ width, height }}
+                            onClick={(e) => e.stopPropagation()}
+                          >
+                            <RenderLayer documentId={activeDocumentId} pageIndex={pageIndex} />
+                          </div>
+                        )}
+                      />
+                    </Viewport>
+                  </>
+                )}
+              </DocumentContent>
+                  
               {!hideControls && (!isMobile || isFullscreen) && (
                 <Controls
                   documentId={activeDocumentId}
@@ -542,6 +578,7 @@ if (isLoading || !engine) {
                   forceMobile={false}
                   isMobile={isMobile}
                   isSmall={isSmall}
+                  viewerRef={viewerRef}
                 />
               )}
             </>
diff --git a/src/components/screens/Info.tsx b/src/components/screens/Info.tsx
index c9f729cb..d3748ea3 100644
--- a/src/components/screens/Info.tsx
+++ b/src/components/screens/Info.tsx
@@ -4,13 +4,10 @@ import {
   Check,
   Filter,
   Book,
-  ArrowUpRight,
 } from "lucide-react";
 import Image from "next/image";
-import man from "@/assets/man.svg" assert { type: "image/svg" };
-import man1 from "@/assets/man1.svg" assert { type: "image/svg" };
-import Link from "next/link";
-import { Button } from "@/components/ui/button";
+import man from "@/assets/man.svg" with { type: "image/svg" };
+import man1 from "@/assets/man1.svg" with { type: "image/svg" };
 import PWAInstallButton from "../ui/PWAInstallButton";
 
 function Info() {
diff --git a/src/components/ui/PWAInstallButton.tsx b/src/components/ui/PWAInstallButton.tsx
index 85275d6a..1ed3a3fd 100644
--- a/src/components/ui/PWAInstallButton.tsx
+++ b/src/components/ui/PWAInstallButton.tsx
@@ -16,7 +16,7 @@ const PWAInstallButton = () => {
   const [deferredPrompt, setDeferredPrompt] =
     useState<BeforeInstallPromptEvent | null>(null);
   const [canInstall, setCanInstall] = useState(false);
-  const [isMobile, setIsMobile] = useState(false);
+  const [, setIsMobile] = useState(false);
 
   useEffect(() => {
     const checkMobile = () => {
diff --git a/src/components/ui/PinnedModal.tsx b/src/components/ui/PinnedModal.tsx
index b9779419..0c6349a8 100644
--- a/src/components/ui/PinnedModal.tsx
+++ b/src/components/ui/PinnedModal.tsx
@@ -27,8 +27,16 @@ import {
   verticalListSortingStrategy,
   arrayMove,
 } from "@dnd-kit/sortable";
+
+import { type ApiResponse } from '@/interface'
+
 import { CSS } from "@dnd-kit/utilities";
 
+interface userPaperResponse {
+  subject: string;
+  slots: string[]
+}
+
 const SortableItem = ({
   id,
   subject,
@@ -55,7 +63,7 @@ const SortableItem = ({
       ref={setNodeRef}
       style={style}
       {...attributes}
-      className={`mb-2 flex items-center justify-between rounded-md border border-[#3A3745] px-4 py-2 pl-2 shadow-sm ${
+      className={`mb-2 flex items-center justify-between rounded-2xl border border-[#3A3745] px-2 py-1 pl-2 shadow-sm ${
         isDragging ? "scale-[1.02] cursor-grabbing opacity-90" : "cursor-grab"
       }`}
     >
@@ -87,7 +95,7 @@ const PinnedModal = ({
   page?: string;
 }) => {
   const [displayPapers, setDisplayPapers] = useState<IUpcomingPaper[]>([]);
-  const [isLoading, setIsLoading] = useState(true);
+  const [, setIsLoading] = useState(true);
   const [open, setOpen] = useState(false);
   const sensors = useSensors(useSensor(PointerSensor));
 
@@ -97,11 +105,11 @@ const PinnedModal = ({
       const storedSubjects = JSON.parse(
         localStorage.getItem("userSubjects") ?? "[]",
       ) as StoredSubjects;
-      const response = await axios.post<{ subject: string; slots: string[] }[]>(
+      const response = await axios.post<ApiResponse<userPaperResponse[]>>(
         "/api/user-papers",
         storedSubjects,
       );
-      const fetchedPapers = response.data;
+      const fetchedPapers = response.data.data!;
       const fetchedSubjectsSet = new Set(
         fetchedPapers.map((paper) => paper.subject),
       );
@@ -180,9 +188,9 @@ const PinnedModal = ({
       }}
     >
       {page === "Navbar" ? (
-        <DialogTrigger className="flex h-full w-full flex-row items-center gap-2">
-          <Pin size={16} />
-          {triggerName}
+        <DialogTrigger className="flex w-full items-center gap-2.5 bg-transparent hover:bg-transparent focus:bg-transparent text-left cursor-pointer border-0 shadow-none outline-none">
+          <Pin className="h-4 w-4" />
+          <span className="text-xs font-medium">{triggerName}</span>
         </DialogTrigger>
       ) : (
         <DialogTrigger className="flex h-full w-full flex-row items-center justify-center gap-2">
@@ -206,7 +214,7 @@ const PinnedModal = ({
               </div>
             </div>
             <div className="mt-4">
-              <div className="h-64 w-full overflow-y-auto rounded-md border border-[#3A3745] p-2">
+              <div className="h-64 w-full overflow-y-auto rounded-sm border border-[#3A3745] p-2">
                 {displayPapers.length > 0 ? (
                   <DndContext
                     sensors={sensors}
diff --git a/src/components/ui/RequestModal.tsx b/src/components/ui/RequestModal.tsx
index 23339e81..3db869a7 100644
--- a/src/components/ui/RequestModal.tsx
+++ b/src/components/ui/RequestModal.tsx
@@ -27,12 +27,6 @@ import { exams, slots, years } from "@/components/select_options";
 import Fuse from 'fuse.js';
 import { useCourses } from "@/context/courseContext";
 
-type Course = {
-  name?: string | null;
-  courseName?: string | null;
-  title?: string | null;
-};
-
 const RequestModal = ({section = "navbar"} : {section? : string}) => {
     const [open, setOpen] = useState(false);
     const [subjects, setSubjects] = useState<string[]>([]);
@@ -43,7 +37,7 @@ const RequestModal = ({section = "navbar"} : {section? : string}) => {
     const [selectedExam, setSelectedExam] = useState<string | null>(null);
     const [selectedSlot, setSelectedSlot] = useState<string | null>(null);
     const [selectedYear, setSelectedYear] = useState<string | null>(null);
-    const { courses, loading, error, refetch } = useCourses();
+    const { courses } = useCourses();
 
     useEffect(() => {
         setSubjects(courses.map((course) => course.name));
@@ -78,15 +72,15 @@ const RequestModal = ({section = "navbar"} : {section? : string}) => {
         try {
         await toast.promise(
             axios.post("/api/request", {
-            subject: selectedSubject,
-            exam: selectedExam,
-            slot: selectedSlot,
-            year: selectedYear,
+                subject: selectedSubject,
+                exam: selectedExam,
+                slot: selectedSlot,
+                year: selectedYear,
             }),
             {
-            loading: "Submitting your request...",
-            success: "Your paper request was submitted successfully",
-            error: "Failed to submit your request. Please try again later.",
+                loading: "Submitting your request...",
+                success: "Your paper request was submitted successfully",
+                error: "Failed to submit your request. Please try again later.",
             },
         );
 
@@ -121,9 +115,9 @@ const RequestModal = ({section = "navbar"} : {section? : string}) => {
     if (isOpen) resetModal();
     }}>
         {section === "navbar" ?
-        <DialogTrigger className='flex items-center gap-2'>
+        <DialogTrigger className="flex w-full items-center gap-2.5 bg-transparent hover:bg-transparent focus:bg-transparent text-left cursor-pointer border-0 shadow-none outline-none">
             <ArrowUpRight className="h-4 w-4"/>
-            <span className="font-medium">Request Paper</span>
+            <span className="text-xs font-medium">Request Paper</span>
         </DialogTrigger> :
         <DialogTrigger className='underline text-[#562EE7] dark:text-[#A47DE5] '>
             <span className="font-medium">request a paper.</span>
@@ -143,7 +137,7 @@ const RequestModal = ({section = "navbar"} : {section? : string}) => {
                     value={searchText}
                     onChange={(e) => setSearchText(e.target.value)}
                     placeholder="Search by subject..."
-                    className={`text-md rounded-lg bg-[#B2B8FF] px-4 py-6 pr-10 font-play tracking-wider text-black shadow-sm ring-0 placeholder:text-black focus:outline-none focus:ring-0 dark:bg-[#7480FF66] dark:text-white placeholder:dark:text-white ${suggestions.length > 0 ? "rounded-b-none" : ""}`}
+                    className={`text-md rounded-2xl bg-[#B2B8FF] px-4 py-6 pr-10 font-play tracking-wider text-black shadow-sm ring-0 placeholder:text-black focus:outline-none focus:ring-0 dark:bg-[#7480FF66] dark:text-white placeholder:dark:text-white ${suggestions.length > 0 ? "rounded-b-none" : ""}`}
                     />
                     <button
                     type="button"
@@ -154,7 +148,7 @@ const RequestModal = ({section = "navbar"} : {section? : string}) => {
                     {suggestions.length > 0 && (
                     <ul
                         ref={suggestionsRef}
-                        className="absolute z-20 max-h-[250px] w-full max-w-xl overflow-y-auto rounded-md rounded-t-none border border-t-0 bg-white text-center shadow-lg dark:bg-[#303771]"
+                        className="absolute z-20 max-h-[250px] w-full max-w-xl overflow-y-auto rounded-2xl rounded-t-none border border-t-0 bg-white text-center shadow-lg dark:bg-[#303771]"
                     >
                         {suggestions.map((s, idx) => (
                         <li
diff --git a/src/components/ui/announcement/Announcement.tsx b/src/components/ui/announcement/Announcement.tsx
new file mode 100644
index 00000000..9afd4f11
--- /dev/null
+++ b/src/components/ui/announcement/Announcement.tsx
@@ -0,0 +1,321 @@
+"use client";
+
+import * as React from "react";
+import Image from "next/image";
+import Link from "next/link";
+import { X, Megaphone, ArrowUpRight, type LucideIcon } from "lucide-react";
+import { cn } from "@/lib/utils";
+
+export type AnnouncementAccent = "purple" | "amber" | "green" | "rose";
+export type AnnouncementVariant = "banner" | "card";
+
+export interface AnnouncementProps {
+  /**
+   * Stable, unique id for this announcement (e.g. "cookoff-2026").
+   * Used as the localStorage key so a dismissal is remembered per-campaign,
+   * not globally — dismissing one promo doesn't hide future ones.
+   */
+  id: string;
+  title: string;
+  message: string;
+  variant?: AnnouncementVariant;
+  /** Call-to-action label, e.g. "Register now". Omit to render without a CTA. */
+  ctaLabel?: string;
+  /** Where the CTA (and, for banners, the whole strip) links to. External links open in a new tab automatically. */
+  href?: string;
+  /** Card-variant only: image shown above the copy (16:9). Ignored for banners. */
+  imageUrl?: string;
+  imageAlt?: string;
+  /** Custom lucide icon; defaults to a megaphone. */
+  icon?: LucideIcon;
+  /** Color preset. Pick based on urgency/category, not vibes: purple = general promo, amber = time-sensitive, green = opportunity/open, rose = urgent/closing soon. */
+  accent?: AnnouncementAccent;
+  /** Whether the person can dismiss it. Defaults to true. */
+  dismissible?: boolean;
+  /** ISO date string. Past this date the announcement stops rendering, dismissed or not — no stale promos. */
+  expiresAt?: string;
+  /** Shows a small "Sponsored" tag for transparency. Defaults to true — this is an ad, say so. */
+  sponsored?: boolean;
+  onDismiss?: () => void;
+  className?: string;
+}
+
+const accentStyles: Record<
+  AnnouncementAccent,
+  {
+    cardBorder: string;
+    cardSurface: string;
+    bannerSurface: string;
+    chip: string;
+    chipIcon: string;
+    accentText: string;
+    cta: string;
+    tagText: string;
+  }
+> = {
+  purple: {
+    cardBorder: "border-[#734DFF] dark:border-[#36266D]",
+    cardSurface: "bg-white dark:bg-[#171720]",
+    bannerSurface: "bg-[#EFEAFF] dark:bg-[#171720]",
+    chip: "bg-[#EFEAFF] dark:bg-[#262635]",
+    chipIcon: "text-[#562EE7] dark:text-[#A79DFF]",
+    accentText: "text-[#562EE7] dark:text-[#A79DFF]",
+    cta: "bg-[#734DFF] text-white hover:bg-[#5F3FE0]",
+    tagText: "text-[#734DFF] dark:text-[#A79DFF]",
+  },
+  amber: {
+    cardBorder: "border-[#d97706] dark:border-[#7c4a08]",
+    cardSurface: "bg-white dark:bg-[#171720]",
+    bannerSurface: "bg-[#fef3c7] dark:bg-[#3a2a05]",
+    chip: "bg-[#fde8b8] dark:bg-[#4a3608]",
+    chipIcon: "text-[#92600b] dark:text-[#f5c451]",
+    accentText: "text-[#92600b] dark:text-[#f5c451]",
+    cta: "bg-[#d97706] text-white hover:bg-[#b8630a]",
+    tagText: "text-[#92600b] dark:text-[#f5c451]",
+  },
+  green: {
+    cardBorder: "border-[#16a34a] dark:border-[#0f6b32]",
+    cardSurface: "bg-white dark:bg-[#171720]",
+    bannerSurface: "bg-[#dcfce7] dark:bg-[#052e13]",
+    chip: "bg-[#c7f7d4] dark:bg-[#0b3d1c]",
+    chipIcon: "text-[#15803d] dark:text-[#6ee7a0]",
+    accentText: "text-[#15803d] dark:text-[#6ee7a0]",
+    cta: "bg-[#16a34a] text-white hover:bg-[#128a3e]",
+    tagText: "text-[#15803d] dark:text-[#6ee7a0]",
+  },
+  rose: {
+    cardBorder: "border-[#e11d48] dark:border-[#8a0f2c]",
+    cardSurface: "bg-white dark:bg-[#171720]",
+    bannerSurface: "bg-[#ffe4e6] dark:bg-[#3f0d16]",
+    chip: "bg-[#ffd2d6] dark:bg-[#521022]",
+    chipIcon: "text-[#be123c] dark:text-[#fda4b0]",
+    accentText: "text-[#be123c] dark:text-[#fda4b0]",
+    cta: "bg-[#e11d48] text-white hover:bg-[#c11640]",
+    tagText: "text-[#be123c] dark:text-[#fda4b0]",
+  },
+};
+
+function isExternal(href: string): boolean {
+  return /^https?:\/\//i.test(href);
+}
+
+function SmartLink({
+  href,
+  className,
+  children,
+  ariaLabel,
+}: {
+  href: string;
+  className?: string;
+  children: React.ReactNode;
+  ariaLabel?: string;
+}) {
+  if (isExternal(href)) {
+    return (
+      <a
+        href={href}
+        target="_blank"
+        rel="noopener noreferrer"
+        className={className}
+        aria-label={ariaLabel}
+      >
+        {children}
+      </a>
+    );
+  }
+  return (
+    <Link href={href} className={className} aria-label={ariaLabel}>
+      {children}
+    </Link>
+  );
+}
+
+/**
+ * Reusable promo/announcement unit for advertising events, deadlines, or
+ * sponsors on the papers site. Two variants:
+ *
+ *  - "banner": a thin dismissible strip, meant for the top of a page.
+ *  - "card": a promo card sized to match `Card.tsx`, meant to sit inside
+ *     the same paper grid (`grid-cols-1 md:grid-cols-2 lg:grid-cols-4`) as
+ *     a native-feeling in-feed ad.
+ *
+ * Dismissal is remembered per `id` in localStorage, and an optional
+ * `expiresAt` retires the announcement automatically so stale promos never
+ * linger after an event has passed.
+ */
+export default function Announcement({
+  id,
+  title,
+  message,
+  variant = "banner",
+  ctaLabel,
+  href,
+  imageUrl,
+  imageAlt,
+  icon: Icon = Megaphone,
+  accent = "purple",
+  dismissible = true,
+  expiresAt,
+  sponsored = true,
+  onDismiss,
+  className,
+}: AnnouncementProps) {
+  const [mounted, setMounted] = React.useState(false);
+  const [dismissed, setDismissed] = React.useState(false);
+
+  const storageKey = `announcement:${id}:dismissed`;
+
+  const isExpired = React.useMemo(() => {
+    if (!expiresAt) return false;
+    const expiry = new Date(expiresAt);
+    if (Number.isNaN(expiry.getTime())) return false;
+    return Date.now() > expiry.getTime();
+  }, [expiresAt]);
+
+  React.useEffect(() => {
+    setMounted(true);
+    if (dismissible) {
+      try {
+        setDismissed(window.localStorage.getItem(storageKey) === "true");
+      } catch {
+        setDismissed(false);
+      }
+    }
+  }, [storageKey, dismissible]);
+
+  const handleDismiss = () => {
+    setDismissed(true);
+    try {
+      window.localStorage.setItem(storageKey, "true");
+    } catch {
+    }
+    onDismiss?.();
+  };
+
+  if (!mounted || isExpired || (dismissible && dismissed)) return null;
+
+  const styles = accentStyles[accent];
+
+  if (variant === "banner") {
+    return (
+      <div
+        role="region"
+        aria-label={sponsored ? `Sponsored announcement: ${title}` : `Announcement: ${title}`}
+        className={cn(
+          "relative w-full font-play",
+          styles.bannerSurface,
+          className,
+        )}
+      >
+        <div className="mx-auto flex max-w-screen-2xl flex-col items-start gap-3 px-4 py-3 sm:flex-row sm:items-center sm:gap-4 md:px-8">
+          <div className={cn("flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-full", styles.chip)}>
+            <Icon className={cn("h-5 w-5", styles.chipIcon)} />
+          </div>
+
+          <div className="flex min-w-0 flex-1 flex-col gap-0.5 sm:flex-row sm:items-center sm:gap-2">
+            <span className={cn("whitespace-nowrap text-sm font-semibold", styles.accentText)}>
+              {title}
+            </span>
+            <span className="text-sm text-gray-700 dark:text-gray-300 sm:truncate">
+              {message}
+            </span>
+          </div>
+
+          <div className="flex w-full items-center justify-between gap-3 sm:w-auto sm:justify-end">
+            {sponsored && (
+              <span className={cn("text-[10px] font-semibold uppercase tracking-wide opacity-70", styles.tagText)}>
+                Sponsored
+              </span>
+            )}
+
+            {ctaLabel && href && (
+              <SmartLink
+                href={href}
+                className={cn(
+                  "inline-flex flex-shrink-0 items-center gap-1 rounded-full px-3 py-1.5 text-xs font-semibold transition-colors",
+                  styles.cta,
+                )}
+              >
+                {ctaLabel}
+                <ArrowUpRight className="h-3.5 w-3.5" />
+              </SmartLink>
+            )}
+
+            {dismissible && (
+              <button
+                onClick={handleDismiss}
+                aria-label="Dismiss announcement"
+                className={cn("flex-shrink-0 rounded-full p-1 transition hover:opacity-70", styles.accentText)}
+              >
+                <X className="h-4 w-4" />
+              </button>
+            )}
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  // Card variant — sized to sit inside the same grid as paper Cards.
+  return (
+    <div
+      role="region"
+      aria-label={sponsored ? `Sponsored announcement: ${title}` : `Announcement: ${title}`}
+      className={cn(
+        "relative flex flex-col overflow-hidden rounded-sm border-2 font-play transition-all duration-150",
+        styles.cardBorder,
+        styles.cardSurface,
+        className,
+      )}
+    >
+      {dismissible && (
+        <button
+          onClick={handleDismiss}
+          aria-label="Dismiss announcement"
+          className="absolute right-2 top-2 z-10 rounded-full bg-black/40 p-1 text-white transition hover:bg-black/60"
+        >
+          <X className="h-3.5 w-3.5" />
+        </button>
+      )}
+
+      {imageUrl ? (
+        <Image
+          src={imageUrl}
+          alt={imageAlt ?? title}
+          width={320}
+          height={180}
+          className="w-full object-cover p-4 pb-3 md:h-[250px]"
+        />
+      ) : (
+        <div className={cn("m-4 mb-0 flex h-[150px] items-center justify-center rounded-sm md:h-[218px]", styles.chip)}>
+          <Icon className={cn("h-10 w-10", styles.chipIcon)} />
+        </div>
+      )}
+
+      <div className="flex flex-1 flex-col justify-between space-y-3 p-4">
+        <div className="space-y-1.5">
+          {sponsored && (
+            <span className={cn("text-[10px] font-semibold uppercase tracking-wide opacity-70", styles.tagText)}>
+              Sponsored
+            </span>
+          )}
+          <div className="font-play text-lg font-semibold leading-snug">{title}</div>
+          <p className="text-sm text-gray-600 dark:text-gray-400">{message}</p>
+        </div>
+
+        {ctaLabel && href && (
+          <SmartLink
+            href={href}
+            className={cn(
+              "inline-flex w-fit items-center gap-1.5 rounded-full px-4 py-2 text-sm font-semibold transition-colors",
+              styles.cta,
+            )}
+          >
+            {ctaLabel}
+            <ArrowUpRight className="h-4 w-4" />
+          </SmartLink>
+        )}
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/src/components/ui/dialog.tsx b/src/components/ui/dialog.tsx
index b5aaef74..a8dffd95 100644
--- a/src/components/ui/dialog.tsx
+++ b/src/components/ui/dialog.tsx
@@ -30,14 +30,16 @@ DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
 
 const DialogContent = React.forwardRef<
   React.ElementRef<typeof DialogPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> & {
+    container?: HTMLElement | null
+  }
 >(({ className, children, ...props }, ref) => (
-  <DialogPortal>
+  <DialogPortal container={props.container}>
     <DialogOverlay />
     <DialogPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] rounded-2xl",
         className
       )}
       {...props}
diff --git a/src/components/ui/dropdown-menu.tsx b/src/components/ui/dropdown-menu.tsx
index 84856cd9..b6212439 100644
--- a/src/components/ui/dropdown-menu.tsx
+++ b/src/components/ui/dropdown-menu.tsx
@@ -87,10 +87,10 @@ const DropdownMenuItem = React.forwardRef<
   <DropdownMenuPrimitive.Item
     ref={ref}
     className={cn(
-      "relative flex cursor-default select-none items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-none transition-colors focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
-      inset && "pl-8",
-      className,
-    )}
+  "relative flex cursor-default select-none items-center gap-2 rounded-xl px-2 py-1.5 text-sm outline-none transition-colors hover:bg-[#1F2A3D] focus:bg-[#1F2A3D] text-white data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&>svg]:size-4 [&>svg]:shrink-0",
+  inset && "pl-8",
+  className,
+)}
     {...props}
   />
 ));
diff --git a/src/context/PaperContext.tsx b/src/context/PaperContext.tsx
index 1b511e2c..ea6a1bf8 100644
--- a/src/context/PaperContext.tsx
+++ b/src/context/PaperContext.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { createContext, useContext, ReactNode } from "react";
+import { createContext, useContext, type ReactNode } from "react";
 
 interface PaperContextType {
   paperId: string;
diff --git a/src/context/courseContext.tsx b/src/context/courseContext.tsx
index aef5386b..2e294989 100644
--- a/src/context/courseContext.tsx
+++ b/src/context/courseContext.tsx
@@ -8,6 +8,8 @@ import {
   type ICourseWithCount,
 } from "@/interface";
 
+import { type ApiResponse } from '@/interface'
+
 interface CoursesContextType {
   courses: ICourseWithCount[];
   loading: boolean;
@@ -15,10 +17,6 @@ interface CoursesContextType {
   refetch: () => Promise<void>;
 }
 
-interface ApiError {
-  message?: string;
-}
-
 const CoursesContext = createContext<CoursesContextType | undefined>(undefined);
 
 export function CoursesProvider({ children }: { children: React.ReactNode }) {
@@ -30,19 +28,17 @@ export function CoursesProvider({ children }: { children: React.ReactNode }) {
     setLoading(true);
     setError(null);
     try {
-      const res = await axios.get<ICourse[]>("/api/course-list", {
+      const res = await axios.get<ApiResponse<ICourse[]>>("/api/course-list", {
         headers: { "Cache-Control": "no-cache" },
       });
-
-      const countRes = await axios.get<ICourseCount[]>("/api/papers/count", {
+      const countRes = await axios.get<ApiResponse<ICourseCount[]>>("/api/papers/count", {
         headers: { "Cache-Control": "no-cache" },
       });
-
       const countMap = new Map<string, number>(
-        countRes.data.map((c) => [c.name, c.count]),
+        (countRes.data.data ?? []).map((c) => [c.name, c.count]),
       );
 
-      const mergedCourses: ICourseWithCount[] = res.data.map((course) => ({
+      const mergedCourses: ICourseWithCount[] = (res.data.data ?? []).map((course) => ({
         _id: course._id,
         name: course.name,
         count: countMap.get(course.name) ?? 0,
@@ -50,7 +46,7 @@ export function CoursesProvider({ children }: { children: React.ReactNode }) {
 
       setCourses(mergedCourses);
     } catch (err: unknown) {
-      if (axios.isAxiosError<ApiError>(err)) {
+      if (axios.isAxiosError<ApiResponse<never>>(err)) {
         setError(err.response?.data?.message ?? err.message);
       } else if (err instanceof Error) {
         setError(err.message);
diff --git a/src/context/filterContext.tsx b/src/context/filterContext.tsx
index 69c643c9..9ac343cb 100644
--- a/src/context/filterContext.tsx
+++ b/src/context/filterContext.tsx
@@ -8,7 +8,7 @@ import React, {
   type ReactNode,
 } from "react";
 import {
-  ReadonlyURLSearchParams,
+  type ReadonlyURLSearchParams,
   useRouter,
   useSearchParams,
 } from "next/navigation";
@@ -147,17 +147,22 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
       new Set(selectedPapers.map((paper) => paper._id)),
     ).map((id) => selectedPapers.find((paper) => paper._id === id)) as IPaper[];
 
-    for (const paper of uniquePapers) {
-      try {
-        console.log(paper);
-        const response = await fetch(getSecureUrl(paper.file_url));
-        const blob = await response.blob();
-        const filename = generateFileName(paper);
-        zip.file(filename, blob);
-      } catch (err) {
-        console.error(`Failed to fetch ${paper.file_url}`, err);
-      }
-    }
+    await Promise.all(
+       uniquePapers.map(async (paper) => {
+        try {
+          const response = await fetch(getSecureUrl(paper.file_url));
+          if (!response.ok) {
+            throw new Error(`HTTP ${response.status}`);
+          }
+          const blob = await response.blob();
+          const filename = generateFileName(paper);
+          zip.file(filename, blob);
+          } catch (err) {
+            console.error(`Failed to fetch ${paper.file_url}`, err);
+          }
+        }),
+    );   
+
     function getDownloadName(
       params: ReadonlyURLSearchParams,
       key: string,
@@ -179,7 +184,7 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
     a.remove();
     URL.revokeObjectURL(url);
     toast.success("Download Initiated");
-  }, [searchParams, selectedPapers, subject]);
+  }, [searchParams, selectedPapers]);
 
   const handleApplyFilters = useCallback(
     (
diff --git a/src/data/slot_to_subjects.json b/src/data/slot_to_subjects.json
new file mode 100644
index 00000000..d68367f3
--- /dev/null
+++ b/src/data/slot_to_subjects.json
@@ -0,0 +1,724 @@
+{
+  "A1": [
+    "Advanced Database Management Systems [CSI2004]",
+    "Advanced Server Side Programming [CSI3023]",
+    "Advanced Data Visualization Techniques [CSI3005]",
+    "Advanced Graph Algorithms [CSI3020]",
+    "Business Intelligence [CSI3017L]",
+    "Lean Start-up Management [MGT1022]",
+    "Introduction to Innovative Projects [PHY1901]",
+    "Discrete Mathematics [MAT1026]",
+    "Operations Research for Data Analysis [MAT1028]",
+    "Machine learning for Data Science [MAT6005]",
+    "Advances in Data Engineering [MDI3005]",
+    "Analytical Techniques in Biotechnology [BBIT206L]",
+    "Downstream Processing [BBIT328L]",
+    "Design and Analysis of Algorithms [BCSE204L]",
+    "Computer Architecture and Organization [BCSE205L]",
+    "Deep Learning [BCSE332L]",
+    "Differential Equations and Transforms [BMAT102L]",
+    "Microbiology [BABIT102]",
+    "Multivariable Calculus and Differential Equations [BAMAT101]",
+    "Building Planning and Drawing [BCLE206E]",
+    "Water Resources Engineering [BCLE306L]",
+    "Urban Planning and Development [BCLE211L]",
+    "Complex Variables and Linear Algebra [BMAT201L]",
+    "Computational Methods in Chemical Engineering [BCHE201L]",
+    "Transport Phenomena [BCHE204L]",
+    "Privacy and Security in IoT [BCSE314L]",
+    "Malware Analysis [BCSE321L]",
+    "Cryptocurrency Technologies [BCSE328L]",
+    "Web Programming [BCSE203E]",
+    "Software Engineering [BCSE301L]",
+    "Computer Programming: Java [BCSE103E]",
+    "Discrete Mathematics and Linear Algebra [BAMAT205]",
+    "Database Systems [BITE302L]",
+    "Network and Information Security [BITE401L]",
+    "Distributed Computing [BITE402L]",
+    "Analog Electronics [BEEE208L]",
+    "VLSI Design [BEEE211E]",
+    "Digital Electronics [BAEEE201]",
+    "Random Processes [BECE207L]",
+    "Wireless and Mobile Communications [BECE317L]",
+    "Network Theory [BAECE103]",
+    "Engineering Optimization [BMEE215L]",
+    "Artificial Intelligence [BMEE407L]",
+    "Linear Algebra and Integral Transforms [BAMAT206]"
+  ],
+  "A2": [
+    "Advanced Database Management Systems [CSI2004]",
+    "Advanced Server Side Programming [CSI3023]",
+    "Advanced Data Visualization Techniques [CSI3005]",
+    "Internet of Everything [CSI3008]",
+    "Advanced Graph Algorithms [CSI3020]",
+    "Lean Start-up Management [MGT1022]",
+    "Engineering Physics [PHY1701]",
+    "Introduction to Innovative Projects [PHY1901]",
+    "Cloud Computing Techniques [CSE1032]",
+    "Operations Research for Data Analysis [MAT1028]",
+    "Multivariate Data Analysis [MAT5017]",
+    "Advances in Data Engineering [MDI3005]",
+    "Analytical Techniques in Biotechnology [BBIT206L]",
+    "Downstream Processing [BBIT328L]",
+    "Chinese I [BCHI101L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Indian Classical Music [BHUM102E]",
+    "Macro Economics [BHUM104L]",
+    "Principles of Sociology [BHUM106L]",
+    "Sustainability and Society [BHUM107L]",
+    "Urban Community Development [BHUM108L]",
+    "Cognitive Psychology [BHUM110L]",
+    "Japanese I [BJAP101L]",
+    "Engineering Physics [BPHY101L]",
+    "Design and Analysis of Algorithms [BCSE204L]",
+    "Computer Architecture and Organization [BCSE205L]",
+    "Deep Learning [BCSE332L]",
+    "Rural Development [BHUM202L]",
+    "Industrial Psychology [BHUM204L]",
+    "International Economics [BHUM206L]",
+    "Economics of Strategy [BHUM208L]",
+    "Game Theory [BHUM209L]",
+    "Indian Culture and Heritage [BHUM216L]",
+    "Differential Equations and Transforms [BMAT102L]",
+    "Microbiology [BABIT102]",
+    "Building Planning and Drawing [BCLE206E]",
+    "Water Resources Engineering [BCLE306L]",
+    "AI in Civil Engineering [BCLE210L]",
+    "Computational Methods in Chemical Engineering [BCHE201L]",
+    "Transport Phenomena [BCHE204L]",
+    "Happiness and Well-being [BHUM111L]",
+    "Cryptocurrency Technologies [BCSE328L]",
+    "Web Programming [BCSE203E]",
+    "Software Engineering [BCSE301L]",
+    "Discrete Mathematics and Linear Algebra [BAMAT205]",
+    "Database Systems [BITE302L]",
+    "Distributed Computing [BITE402L]",
+    "Analog Electronics [BEEE208L]",
+    "Power Systems Analysis [BEEE306L]",
+    "Microprocessors and Microcontrollers [BEEE309L]",
+    "VLSI Design [BEEE211E]",
+    "Digital Electronics [BAEEE201]",
+    "Random Processes [BECE207L]",
+    "Wireless and Mobile Communications [BECE317L]",
+    "Circuit Theory [BECE203L]",
+    "Network Theory [BAECE103]",
+    "Industrial Revolution 4.0 [BMEE410L]",
+    "Engineering Optimization [BMEE215L]",
+    "Artificial Intelligence [BMEE407L]",
+    "Linear Algebra and Integral Transforms [BAMAT206]"
+  ],
+  "B1": [
+    "Software Engineering Principles [CSI1007]",
+    "Software Application Architecture [CSI3024]",
+    "Deep Learning [CSI3028]",
+    "Advances in Pervasive Computing [CSI3032]",
+    "Advanced Predictive Analytics [MDI3003L]",
+    "Design and Analysis of Algorithms [MAT1027]",
+    "Statistical Quality Control [MAT1029]",
+    "Time Series Analysis and Forecasting [MAT5016]",
+    "Advances in Web Technologies [MDI3001]",
+    "Computational Biology [BBIT406L]",
+    "Public Policy and Administration [BHUM105L]",
+    "Cognitive Psychology [BHUM110L]",
+    "Probability and Statistics [BMAT202L]",
+    "Economics of Money, Banking and Financial Markets [BHUM221L]",
+    "Technical English Communication [BAENG101]",
+    "Multivariable Calculus and Differential Equations [BAMAT101]",
+    "Physics for Biologist [BAPHY102]",
+    "Transportation Engineering [BCLE305L]",
+    "Estimating and Costing [BCLE309L]",
+    "Heat Transfer [BCHE208L]",
+    "Process Utilities and Pipeline Design [BCHE311L]",
+    "Programming for IoT Boards [BCSE312L]",
+    "Blockchain Architecture Design [BCSE326L]",
+    "Exploratory Data Analysis [BCSE331L]",
+    "Theory of Computation [BCSE304L]",
+    "Cryptography and Network Security [BCSE309L]",
+    "Cell Biology and Genetics [BBIT324L]",
+    "Software Engineering [BITE307L]",
+    "Big Data Analytics [BITE411L]",
+    "Quantum Computing [BITE407L]",
+    "Digital Signal Processing [BEEE302L]",
+    "Control Systems [BEEE303L]",
+    "Electric Drives [BEEE307L]",
+    "Embedded C Programming [BECE320E]",
+    "Linear Algebra [BAMAT202]",
+    "VLSI System Design [BECE303L]",
+    "Analog Communication Systems [BECE304L]",
+    "Digital Communication Systems [BECE306L]",
+    "Medical Image Analysis [BBMD203L]",
+    "Image Processing and Data Analysis [BHST303L]",
+    "Kinematics and Dynamics of Machines [BMEE207L]",
+    "Control Systems [BMEE330L]"
+  ],
+  "B2": [
+    "Software Engineering Principles [CSI1007]",
+    "Software Application Architecture [CSI3024]",
+    "Deep Learning [CSI3028]",
+    "Advances in Pervasive Computing [CSI3032]",
+    "Applications of Differential and Difference Equations [MAT2002]",
+    "Business Intelligence [CSI3017L]",
+    "Advanced Predictive Analytics [MDI3003L]",
+    "Introduction to Innovative Projects [PHY1901]",
+    "Prathamik Hindi [HIN1003]",
+    "Non Parametric Tests [MAT3011]",
+    "Time Series Analysis and Forecasting [MAT5016]",
+    "Advances in Web Technologies [MDI3001]",
+    "Nanobiotechnology [BBIT316L]",
+    "Arabic [BARB101L]",
+    "Chinese I [BCHI101L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Indian Classical Music [BHUM102E]",
+    "Micro Economics [BHUM103L]",
+    "Macro Economics [BHUM104L]",
+    "Principles of Sociology [BHUM106L]",
+    "Urban Community Development [BHUM108L]",
+    "Social Work and Sustainability [BHUM109L]",
+    "Japanese I [BJAP101L]",
+    "Probability and Statistics [BMAT202L]",
+    "Rural Development [BHUM202L]",
+    "International Economics [BHUM206L]",
+    "International Relations [BHUM215L]",
+    "Indian Culture and Heritage [BHUM216L]",
+    "Engineering Mechanics [BMEE201L]",
+    "Technical English Communication [BAENG101]",
+    "Physics for Biologist [BAPHY102]",
+    "Transportation Engineering [BCLE305L]",
+    "Estimating and Costing [BCLE309L]",
+    "Fluid Mechanics [BCLE202L]",
+    "Heat Transfer [BCHE208L]",
+    "Process Utilities and Pipeline Design [BCHE311L]",
+    "Web Application Security [BCSE320L]",
+    "Theory of Computation [BCSE304L]",
+    "Cryptography and Network Security [BCSE309L]",
+    "Computer Programming: Java [BCSE103E]",
+    "Software Engineering [BITE307L]",
+    "Big Data Analytics [BITE411L]",
+    "Digital Signal Processing [BEEE302L]",
+    "Control Systems [BEEE303L]",
+    "Embedded C Programming [BECE320E]",
+    "FACTS and HVDC [BEEE406L]",
+    "Linear Algebra [BAMAT202]",
+    "Analog Communication Systems [BECE304L]",
+    "Kinematics and Dynamics of Machines [BMEE207L]",
+    "Control Systems [BMEE330L]"
+  ],
+  "C1": [
+    "Microprocessor and Interfacing Techniques [CSI2006]",
+    "Distributed Systems [CSI3012]",
+    "Advanced C Programming [CSE2010L]",
+    "Lean Start-up Management [MGT1022]",
+    "Introduction to Innovative Projects [PHY1901]",
+    "Discrete Mathematics [MAT1026]",
+    "Operations Research for Data Analysis [MAT1028]",
+    "Programming for Data Analysis [MAT6012]",
+    "Neural Networks and Deep Learning [MDI4009]",
+    "Industrial Biotechnology [BBIT308L]",
+    "AI in Biology [BBIT310L]",
+    "Neurobiology and Cognitive Science [BBIT402L]",
+    "Principles of Chemical Engineering [BBIT201L]",
+    "Engineering Chemistry [BCHY101L]",
+    "Basic Electrical and Electronics Engineering [BEEE102L]",
+    "Spanish I [BESP101L]",
+    "German I [BGER101L]",
+    "Social Work and Sustainability [BHUM109L]",
+    "Japanese I [BJAP101L]",
+    "Foundations of Data Science [BCSE206L]",
+    "Machine Learning [BCSE209L]",
+    "Discrete Mathematics and Graph Theory [BMAT205L]",
+    "Industrial Psychology [BHUM204L]",
+    "Development Economics [BHUM205L]",
+    "Economics of Money, Banking and Financial Markets [BHUM221L]",
+    "Differential Equations and Transforms [BMAT102L]",
+    "Technical English Communication [BAENG101]",
+    "Multivariable Calculus and Differential Equations [BAMAT101]",
+    "Linear Algebra and Dynamical Systems [BAMAT203]",
+    "Soil Mechanics [BCLE207L]",
+    "Building Information Modeling [BCLE317E]",
+    "Air and Noise Pollution Control [BCLE312L]",
+    "Complex Variables and Linear Algebra [BMAT201L]",
+    "Momentum Transfer [BCHE205L]",
+    "Chemical Reaction Engineering II [BCHE306L]",
+    "IoT Architectures and Protocols [BCSE310L]",
+    "Information Security [BCSE317L]",
+    "Foundations of Blockchain Technology [BCSE324L]",
+    "Natural Language Processing [BCSE409L]",
+    "Digital Systems Design [BECE102L]",
+    "Microprocessors and Microcontrollers [BECE204L]",
+    "Database Systems [BCSE302L]",
+    "Computer Programming: Java [BCSE103E]",
+    "Data Analytics in Bioinformatics [BBIT327L]",
+    "Engineering Physics [BAPHY105]",
+    "Web Technologies [BITE304L]",
+    "Data Mining [BITE312E]",
+    "Object Oriented Analysis and Design [BITE404E]",
+    "Cyber Security [BITE413L]",
+    "Applied Chemistry [BACHY105]",
+    "Power Systems Engineering [BEEE304L]",
+    "Embedded C Programming [BECE320E]",
+    "Electromagnetic Field Theory [BAEEE204]",
+    "Signals and Systems [BAEIE101]",
+    "Computer Communications and Networks [BECE401L]",
+    "Complex Variables and Linear Algebra [BAMAT201]",
+    "Fundamentals of Artificial Intelligence for Healthcare [BAHST102]",
+    "Thermal Engineering Systems [BMEE303L]",
+    "Computer Aided Design and Finite Element Analysis [BMEE306L]",
+    "Mechanics of Materials [BAMEE201]"
+  ],
+  "C2": [
+    "Microprocessor and Interfacing Techniques [CSI2006]",
+    "Distributed Systems [CSI3012]",
+    "Advanced C Programming [CSE2010L]",
+    "Engineering Chemistry [CHY1701]",
+    "Web Technologies [CSE1031]",
+    "Discrete Mathematics [MAT1026]",
+    "Big Data Analytics and Visualization [MAT6015]",
+    "Neural Networks and Deep Learning [MDI4009]",
+    "Industrial Biotechnology [BBIT308L]",
+    "AI in Biology [BBIT310L]",
+    "Arabic [BARB101L]",
+    "Engineering Chemistry [BCHY101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Principles of Sociology [BHUM106L]",
+    "Japanese I [BJAP101L]",
+    "Foundations of Data Science [BCSE206L]",
+    "Machine Learning [BCSE209L]",
+    "Rural Development [BHUM202L]",
+    "Political Science [BHUM214L]",
+    "Differential Equations and Transforms [BMAT102L]",
+    "Technical English Communication [BAENG101]",
+    "Linear Algebra and Dynamical Systems [BAMAT203]",
+    "Soil Mechanics [BCLE207L]",
+    "Traffic Engineering [BCLE401L]",
+    "Complex Variables and Linear Algebra [BMAT201L]",
+    "Momentum Transfer [BCHE205L]",
+    "Chemical Reaction Engineering II [BCHE306L]",
+    "IoT Architectures and Protocols [BCSE310L]",
+    "Information Security [BCSE317L]",
+    "Foundations of Blockchain Technology [BCSE324L]",
+    "Natural Language Processing [BCSE409L]",
+    "Digital Systems Design [BECE102L]",
+    "Microprocessors and Microcontrollers [BECE204L]",
+    "Database Systems [BCSE302L]",
+    "Engineering Thermodynamics [BMEE203L]",
+    "Data Analytics in Bioinformatics [BBIT327L]",
+    "Engineering Physics [BAPHY105]",
+    "Web Technologies [BITE304L]",
+    "Theory of Computation [BITE306L]",
+    "Data Mining [BITE312E]",
+    "Object Oriented Analysis and Design [BITE404E]",
+    "Applied Chemistry [BACHY105]",
+    "Power Systems Engineering [BEEE304L]",
+    "Embedded C Programming [BECE320E]",
+    "Electromagnetic Field Theory [BAEEE204]",
+    "Computer Communications and Networks [BECE401L]",
+    "Testing of VLSI Circuits [BEVD309L]",
+    "Complex Variables and Linear Algebra [BAMAT201]",
+    "Design of Machine Elements [BMEE301L]",
+    "Thermal Engineering Systems [BMEE303L]",
+    "Computer Aided Design and Finite Element Analysis [BMEE306L]",
+    "Non-destructive Testing [BMEE313E]",
+    "Engineering Failure Analysis [BMEE322L]",
+    "Mechanics of Materials [BAMEE201]"
+  ],
+  "D1": [
+    "Advanced Algorithms [CSI2003]",
+    "Principles of Compiler Design [CSI2005]",
+    "Fundamentals of Electrical and Electronics Engineering [EEE1024]",
+    "Introduction to Innovative Projects [PHY1901]",
+    "Enhancing Problem Solving Skills [STS3022]",
+    "Enhancing Programming Ability [STS4022]",
+    "Introduction to Internet of Things [CSE1030]",
+    "Basic Hindi [HIN1001]",
+    "Cell Biology and Genetics [BBIT204L]",
+    "Genomics and Proteomics [BBIT303L]",
+    "Animal Biotechnology [BBIT306L]",
+    "Regenerative Medicine [BBIT313L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Japanese I [BJAP101L]",
+    "Probability and Statistics [BMAT202L]",
+    "Quantitative Skills Practice II [BSTS102P]",
+    "Programming for Data Science [BCSE207L]",
+    "Operating Systems [BCSE303L]",
+    "Machine Vision [BCSE417L]",
+    "Mass Communication [BHUM201L]",
+    "Introduction to Psychology [BHUM203L]",
+    "Multivariable Calculus and Differential Equations [BAMAT101]",
+    "Design of Steel Structures [BCLE308L]",
+    "Remote Sensing and GIS [BCLE213E]",
+    "Chemical Process Equipment Design [BCHE308L]",
+    "Data Privacy [BCSE318L]",
+    "Introduction to Bitcoin [BCSE325L]",
+    "Cloud Computing [BCSE408L]",
+    "Biochemistry [BBIT208L]",
+    "Sensors and Actuator Devices [BCSE311L]",
+    "Structured and Object-Oriented Programming [BACSE104]",
+    "Network and Information Security [BITE401L]",
+    "Power Electronics [BEEE301L]",
+    "Control Systems [BEEE303L]",
+    "Measurements and Instrumentation [BEEE305L]",
+    "AC Machines [BEEE312L]",
+    "Digital Signal Processing [BECE301L]",
+    "Antenna and Microwave Engineering [BECE305L]",
+    "Optical Fiber Communications [BECE318L]",
+    "Artificial Intelligence and Machine Learning [BECE309L]",
+    "Electronic Materials and Devices [BECE201L]",
+    "Biochemistry and Molecular Pharmacology [BHST207L]",
+    "Molecular and Cellular Biology for Health Sciences [BAHST203]",
+    "Computer Integrated Manufacturing [BMEE401L]",
+    "Lean Manufacturing [BMEE309L]",
+    "Engineering Innovation and Modelling [BAMEE205]"
+  ],
+  "D2": [
+    "Advanced Algorithms [CSI2003]",
+    "Principles of Compiler Design [CSI2005]",
+    "ESPANOL FUNDAMENTAL [ESP1001]",
+    "Enhancing Problem Solving Skills [STS3022]",
+    "Enhancing Programming Ability [STS4022]",
+    "Basic Electrical and Electronics Engineering [EEE1001]",
+    "Statistical Quality Control [MAT1029]",
+    "Animal Biotechnology [BBIT306L]",
+    "Plant Biotechnology [BBIT307L]",
+    "Pharmaceutical Biotechnology [BBIT312L]",
+    "Water Resource Management [BCLE216L]",
+    "German I [BGER101L]",
+    "Sustainability and Society [BHUM107L]",
+    "Japanese I [BJAP101L]",
+    "Probability and Statistics [BMAT202L]",
+    "Quantitative Skills Practice II [BSTS102P]",
+    "Programming for Data Science [BCSE207L]",
+    "Operating Systems [BCSE303L]",
+    "Machine Vision [BCSE417L]",
+    "Vehicle Body and Aerodynamics Engineering [BMEE414L]",
+    "Rural Development [BHUM202L]",
+    "Behavioral Economics [BHUM211L]",
+    "Multivariable Calculus and Differential Equations [BAMAT101]",
+    "Design of Steel Structures [BCLE308L]",
+    "Remote Sensing and GIS [BCLE213E]",
+    "Process Modelling and Simulation [BCHE307L]",
+    "Chemical Process Equipment Design [BCHE308L]",
+    "Data Privacy [BCSE318L]",
+    "Introduction to Bitcoin [BCSE325L]",
+    "Cloud Computing [BCSE408L]",
+    "Biochemistry [BBIT208L]",
+    "Sensors and Actuator Devices [BCSE311L]",
+    "Structured and Object-Oriented Programming [BACSE104]",
+    "Network and Information Security [BITE401L]",
+    "Measurements and Instrumentation [BEEE305L]",
+    "Communication Systems [BEEE308L]",
+    "AC Machines [BEEE312L]",
+    "Engineering Electromagnetics [BECE205L]",
+    "Digital Signal Processing [BECE301L]",
+    "Optical Fiber Communications [BECE318L]",
+    "Data Structures and Algorithms [BECE208E]",
+    "Biomaterials [BBMD205L]",
+    "Mechanics of Solids [BMEE202L]",
+    "Computer Integrated Manufacturing [BMEE401L]",
+    "Renewable Energy Systems [BMEE205E]",
+    "Quality Control and Improvement [BMEE212L]",
+    "Engineering Innovation and Modelling [BAMEE205]"
+  ],
+  "E1": [
+    "Principles of Compiler Design [CSI2005]",
+    "Data Communication and Networks [CSI2007]",
+    "Application Development and Deployment Architecture [CSI3025]",
+    "Internetworking with TCP/IP [CSI3030]",
+    "Design and Analysis of Algorithms [MAT1027]",
+    "Statistical Quality Control [MAT1029]",
+    "Multivariate Data Analysis [MAT5017]",
+    "Machine Learning for Data Science [MDI4001]",
+    "Forensic Science and Technology [BBIT318L]",
+    "Chinese I [BCHI101L]",
+    "Water Resource Management [BCLE216L]",
+    "Spanish I [BESP101L]",
+    "Public Policy and Administration [BHUM105L]",
+    "Principles of Sociology [BHUM106L]",
+    "Sustainability and Society [BHUM107L]",
+    "Quantitative Skills Practice II [BSTS102P]",
+    "Predictive Analytics [BCSE334L]",
+    "Mass Communication [BHUM201L]",
+    "Indian Culture and Heritage [BHUM216L]",
+    "Advanced Competitive Coding - II [BSTS302P]",
+    "Construction Practices and Management [BCLE307L]",
+    "Chemical Product Design [BCHE320L]",
+    "Wearable Computing [BCSE315L]",
+    "Digital Forensics [BCSE322L]",
+    "Blockchain and Distributed Ledger Technology [BCSE329L]",
+    "Theory of Computation [BCSE304L]",
+    "Compiler Design [BCSE307L]",
+    "Analytical Bioinformatics [BBIT417L]",
+    "Structured and Object-Oriented Programming [BACSE104]",
+    "Data Structures and Algorithms [BACSE105]",
+    "Distributed Computing [BITE402L]",
+    "Embedded Systems and IoT [BITE403L]",
+    "Machine Learning [BEEE410L]",
+    "Electric Vehicles [BEEE416L]",
+    "Chemistry for Electrical and Electronics Engineering [BACHY106]",
+    "Radar Systems [BECE311L]",
+    "Information Theory and Coding [BECE313L]",
+    "Bio Signal Analysis [BBMD202L]",
+    "Heat and Mass Transfer [BMEE402L]",
+    "Industrial Engineering [BMEE208L]",
+    "Turbomachines [BMEE324E]",
+    "Applied Chemistry for Engineers [BACHY109]"
+  ],
+  "E2": [
+    "Data Communication and Networks [CSI2007]",
+    "Application Development and Deployment Architecture [CSI3025]",
+    "Internetworking with TCP/IP [CSI3030]",
+    "Data Engineering for Analytics [MAT3013]",
+    "Programming for Data Analysis [MAT6012]",
+    "Machine Learning for Data Science [MDI4001]",
+    "Computational Biology [BBIT406L]",
+    "Chinese I [BCHI101L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Principles of Sociology [BHUM106L]",
+    "Sustainability and Society [BHUM107L]",
+    "Japanese I [BJAP101L]",
+    "Quantitative Skills Practice II [BSTS102P]",
+    "Automotive Vehicles [BMEE213E]",
+    "Mass Communication [BHUM201L]",
+    "Rural Development [BHUM202L]",
+    "Behavioral Economics [BHUM211L]",
+    "Political Science [BHUM214L]",
+    "Advanced Competitive Coding - II [BSTS302P]",
+    "Construction Practices and Management [BCLE307L]",
+    "Mass Transfer I [BCHE207L]",
+    "Pharmaceutical Technology [BCHE316L]",
+    "Theory of Computation [BCSE304L]",
+    "Compiler Design [BCSE307L]",
+    "Computer Programming: Java [BCSE103E]",
+    "Structured and Object-Oriented Programming [BACSE104]",
+    "Data Structures and Algorithms [BACSE105]",
+    "Embedded Systems and IoT [BITE403L]",
+    "Deep Learning [BEEE422L]",
+    "Chemistry for Electrical and Electronics Engineering [BACHY106]",
+    "Satellite Communications [BECE310L]",
+    "Information Theory and Coding [BECE313L]",
+    "Signals and Systems [BECE202L]",
+    "Bio Signal Analysis [BBMD202L]",
+    "Mechatronics and Measurement Systems [BMEE210L]",
+    "Heat and Mass Transfer [BMEE402L]",
+    "Industrial Engineering [BMEE208L]",
+    "Power Plant Engineering [BMEE326L]",
+    "Design of Transmission Systems [BMEE404L]",
+    "Additive Manufacturing [BMEE408E]",
+    "Applied Chemistry for Engineers [BACHY109]"
+  ],
+  "F1": [
+    "Machine Learning [CSI3026]",
+    "Text Mining [CSI4004]",
+    "Foundations of Data Science [MDI3002]",
+    "Arithmetic Problem Solving [STS2022]",
+    "Introduction to Internet of Things [CSE1030]",
+    "Stem Cell Technology [BBIT314L]",
+    "Bioinformatics [BBIT205L]",
+    "Natural Disaster Mitigation and Management [BCLE212L]",
+    "Global Warming [BCLE214L]",
+    "Basic Electrical and Electronics Engineering [BEEE102L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Micro Economics [BHUM103L]",
+    "Macro Economics [BHUM104L]",
+    "Principles of Sociology [BHUM106L]",
+    "Probability and Statistics [BMAT202L]",
+    "Engineering Physics [BPHY101L]",
+    "Data Structures and Algorithms [BCSE202L]",
+    "Design and Analysis of Algorithms [BCSE204L]",
+    "Data Mining [BCSE208L]",
+    "Rural Development [BHUM202L]",
+    "Introduction to Psychology [BHUM203L]",
+    "Behavioral Economics [BHUM211L]",
+    "Mathematics for Economic Analysis [BHUM212L]",
+    "Financial Management [BHUM218L]",
+    "Economics of Money, Banking and Financial Markets [BHUM221L]",
+    "Advanced Competitive Coding - II [BSTS302P]",
+    "Cell and Molecular Biology [BABIT103]",
+    "Structural Analysis [BCLE208L]",
+    "Optics [BPHY201L]",
+    "Polymer Technology [BCHE310L]",
+    "Fuels and Combustion [BCHE314L]",
+    "Biochemical Engineering [BCHE315L]",
+    "Petroleum Refining Technology [BCHE317L]",
+    "Food Process Engineering [BCHE402L]",
+    "Digital Image Processing [BCSE403L]",
+    "Reinforcement Learning [BCSE432E]",
+    "Microprocessors and Microcontrollers [BECE204L]",
+    "Artificial Intelligence [BCSE306L]",
+    "Molecular Biology [BBIT207L]",
+    "Smart Contracts [BCSE327L]",
+    "Fundamentals of Fog and Edge Computing [BCSE313L]",
+    "Penetration Testing and Vulnerability Analysis [BCSE319L]",
+    "Data Structures and Algorithms [BACSE105]",
+    "Engineering Physics [BAPHY105]",
+    "Digital Electronics [BEEE206L]",
+    "DC Machines and Transformers [BEEE215L]",
+    "Analog Electronics [BAEEE103]",
+    "Health Informatics [BBMD209L]",
+    "Biotechnology for Healthcare [BHST306L]",
+    "Materials in Healthcare [BAHST202]",
+    "Metal Casting and Welding [BMEE302L]",
+    "Refrigeration and Air-conditioning [BMEE320L]",
+    "Internal Combustion Engines [BMEE325L]",
+    "Computational Fluid Dynamics [BMEE409E]"
+  ],
+  "F2": [
+    "Machine Learning [CSI3026]",
+    "Linear Algebra [MAT1022]",
+    "Text Mining [CSI4004]",
+    "Foundations of Data Science [MDI3002]",
+    "Arithmetic Problem Solving [STS2022]",
+    "Introduction to Internet of Things [CSE1030]",
+    "Data Warehousing and Data Mining [MAT3012]",
+    "Cancer Biology and Informatics [BBIT322L]",
+    "Bioinformatics [BBIT205L]",
+    "Natural Disaster Mitigation and Management [BCLE212L]",
+    "Global Warming [BCLE214L]",
+    "Basic Electrical and Electronics Engineering [BEEE102L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Probability and Statistics [BMAT202L]",
+    "Data Structures and Algorithms [BCSE202L]",
+    "Design and Analysis of Algorithms [BCSE204L]",
+    "Data Mining [BCSE208L]",
+    "Advanced Competitive Coding - II [BSTS302P]",
+    "Cell and Molecular Biology [BABIT103]",
+    "Structural Analysis [BCLE208L]",
+    "Biochemical Engineering [BCHE315L]",
+    "Petroleum Refining Technology [BCHE317L]",
+    "Safety and Hazard Analysis [BCHE318L]",
+    "Food Process Engineering [BCHE402L]",
+    "Digital Image Processing [BCSE403L]",
+    "Reinforcement Learning [BCSE432E]",
+    "Microprocessors and Microcontrollers [BECE204L]",
+    "Artificial Intelligence [BCSE306L]",
+    "Molecular Biology [BBIT207L]",
+    "Smart Contracts [BCSE327L]",
+    "Fundamentals of Fog and Edge Computing [BCSE313L]",
+    "Penetration Testing and Vulnerability Analysis [BCSE319L]",
+    "Data Structures and Algorithms [BACSE105]",
+    "Engineering Physics [BAPHY105]",
+    "Analog Electronics [BAEEE103]",
+    "Structured and Object Oriented Programming [BECE209E]",
+    "Medical Imaging Techniques [BBMD204L]",
+    "Metal Casting and Welding [BMEE302L]",
+    "Metal Forming and Machining [BMEE304L]",
+    "Product Design and Development [BMEE307L]",
+    "Industrial Robotics [BMEE316E]"
+  ],
+  "G1": [
+    "Soft Computing Techniques [CSI3006]",
+    "Software Verification and Validation [CSI3014]",
+    "Software Project Management [CSI3015]",
+    "Data Warehousing and Data Mining [CSI3010L]",
+    "Francais quotidien [FRE1001]",
+    "Grundstufe Deutsch [GER1001]",
+    "Statistics for Engineers [MAT2001]",
+    "Big Data Analytics and Visualization [MAT6015]",
+    "Introduction to Innovative Projects [PHY1999]",
+    "Molecular Biology [BBIT209L]",
+    "Arabic [BARB101L]",
+    "Waste Management [BCLE215L]",
+    "Basic Electrical and Electronics Engineering [BEEE102L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Micro Economics [BHUM103L]",
+    "Urban Community Development [BHUM108L]",
+    "Japanese I [BJAP101L]",
+    "Probability and Statistics [BMAT202L]",
+    "Computer Networks [BCSE308L]",
+    "Autonomous Vehicle Systems [BMEE416L]",
+    "Introduction to Psychology [BHUM203L]",
+    "Development Economics [BHUM205L]",
+    "International Economics [BHUM206L]",
+    "Mathematics for Economic Analysis [BHUM212L]",
+    "Contemporary India [BHUM217L]",
+    "Technical English Communication [BAENG101]",
+    "Industrial Waste Management [BCLE311L]",
+    "Classical Mechanics [BPHY202L]",
+    "Nanoscience and Nanotechnology [BCHE322L]",
+    "Design of Smart Cities [BCSE316L]",
+    "Digital Watermarking and Steganography [BCSE323L]",
+    "Public Key Infrastructure and Trust Management [BCSE330L]",
+    "Embedded Systems [BCSE305L]",
+    "Structured and Object-Oriented Programming [BCSE102L]",
+    "Operating Systems [BACSE106]",
+    "Computer Architecture and Organization [BITE301L]",
+    "Soft Computing [BITE405L]",
+    "Mobile Application Development [BITE409L]",
+    "Blockchain Technology [BITE414L]",
+    "Artificial Intelligence [BEEE411L]",
+    "Control Systems [BECE302L]",
+    "Artificial Intelligence and Machine Learning [BECE309L]",
+    "FPGA Based System Design [BECE406E]",
+    "Biomedical Instrumentation and Measurements - II [BBMD201L]",
+    "Digital Logic Design [BAECE102]",
+    "Devices for Diagnostics and Therapeutics [BHST304L]",
+    "Manufacturing Planning and Control [BMEE305L]",
+    "Supply Chain Management [BMEE310L]",
+    "Composite Materials [BMEE321L]",
+    "Gas Dynamics [BMEE323L]",
+    "Materials Science and Engineering [BMEE209L]",
+    "Electrical Machines, Drives and Power Systems [BMEE415L]"
+  ],
+  "G2": [
+    "Soft Computing Techniques [CSI3006]",
+    "Software Verification and Validation [CSI3014]",
+    "Software Project Management [CSI3015]",
+    "Data Warehousing and Data Mining [CSI3010L]",
+    "Statistics for Engineers [MAT2001]",
+    "Introduction to Innovative Projects [PHY1901]",
+    "Design and Analysis of Algorithms [MAT1027]",
+    "Machine learning for Data Science [MAT6005]",
+    "Tamil [TAM1003]",
+    "Molecular Biology [BBIT209L]",
+    "Natural Disaster Mitigation and Management [BCLE212L]",
+    "Waste Management [BCLE215L]",
+    "Basic Electrical and Electronics Engineering [BEEE102L]",
+    "Spanish I [BESP101L]",
+    "French I [BFRE101L]",
+    "German I [BGER101L]",
+    "Probability and Statistics [BMAT202L]",
+    "Computer Networks [BCSE308L]",
+    "Technical English Communication [BAENG101]",
+    "Solid Waste Management [BCLE313L]",
+    "Process Plant Design and Simulation [BCHE319E]",
+    "AI in Chemical Engineering [BCHE406L]",
+    "Public Key Infrastructure and Trust Management [BCSE330L]",
+    "Embedded Systems [BCSE305L]",
+    "Structured and Object-Oriented Programming [BCSE102L]",
+    "Biological Databases [BBIT418L]",
+    "Operating Systems [BACSE106]",
+    "Digital Logic and Microprocessors [BITE202L]",
+    "Computer Architecture and Organization [BITE301L]",
+    "Soft Computing [BITE405L]",
+    "Mobile Application Development [BITE409L]",
+    "Robotics and Control [BEEE409L]",
+    "Artificial Intelligence [BEEE411L]",
+    "Machine Vision [BEEE425L]",
+    "Analog Circuits [BECE206L]",
+    "Control Systems [BECE302L]",
+    "Artificial Intelligence and Machine Learning [BECE309L]",
+    "Robotics and Automation [BECE312L]",
+    "FPGA Based System Design [BECE406E]",
+    "Biomedical Instrumentation and Measurements - I [BBMD102L]",
+    "Digital Logic Design [BAECE102]",
+    "Fluid Mechanics and Machines [BMEE204L]",
+    "Supply Chain Management [BMEE310L]",
+    "Advanced Materials Characterization Methods [BMEE319E]",
+    "Principles of Management [BMGT101L]",
+    "Design of Chassis Components [BMEE413L]"
+  ]
+}
\ No newline at end of file
diff --git a/src/db/papers.ts b/src/db/papers.ts
index 793c7c1e..c3f8781a 100644
--- a/src/db/papers.ts
+++ b/src/db/papers.ts
@@ -1,5 +1,5 @@
 import mongoose, { Schema, type Model } from "mongoose";
-import { type IPaper, type IAdminPaper, type ICourses } from "@/interface";
+import { type IPaper, type IAdminPaper } from "@/interface";
 
 const adminSchema = new Schema<IAdminPaper>({
   file_url: { type: String, required: true },
diff --git a/src/db/upcoming-schedule.ts b/src/db/upcoming-schedule.ts
new file mode 100644
index 00000000..e30a6467
--- /dev/null
+++ b/src/db/upcoming-schedule.ts
@@ -0,0 +1,24 @@
+import mongoose, { Schema, type Model } from "mongoose";
+
+export type IUpcomingSchedule = {
+  date: string;
+  slot: "A" | "B" | "C" | "D" | "E" | "F" | "G";
+};
+
+const upcomingScheduleSchema = new Schema<IUpcomingSchedule>(
+  {
+    date: { type: String, required: true, unique: true },
+    slot: {
+      type: String,
+      required: true,
+      enum: ["A", "B", "C", "D", "E", "F", "G"],
+    },
+  },
+  { timestamps: true },
+);
+
+const UpcomingSchedule: Model<IUpcomingSchedule> =
+  mongoose.models.UpcomingSchedule ??
+  mongoose.model<IUpcomingSchedule>("UpcomingSchedule", upcomingScheduleSchema);
+
+export default UpcomingSchedule;
diff --git a/src/db/upcoming-slot.ts b/src/db/upcoming-slot.ts
index ac321b13..ddfaa4e2 100644
--- a/src/db/upcoming-slot.ts
+++ b/src/db/upcoming-slot.ts
@@ -3,6 +3,12 @@ import mongoose, { Schema, type Model } from "mongoose";
 
 const upcomingSlotSchema = new Schema<IUpcomingSlot>({
   slot: { type: String, required: true, unique: true },
+  lastSyncedDate: { type: String },
+  syncMode: {
+    type: String,
+    enum: ["CAT", "FAT"],
+    default: "CAT",
+  },
 });
 
 const UpcomingSlot: Model<IUpcomingSlot> =
diff --git a/src/interface.ts b/src/interface.ts
index 272ea56a..c64ca357 100644
--- a/src/interface.ts
+++ b/src/interface.ts
@@ -1,7 +1,9 @@
-import { mongo } from "mongoose";
+import { type mongo } from "mongoose";
 
 export interface IUpcomingSlot {
   slot: string;
+  lastSyncedDate?: string;
+  syncMode?: "CAT" | "FAT";
 }
 
 export interface IUpcomingSubject {
@@ -52,6 +54,12 @@ export interface APIResponse {
   status: number;
 }
 
+export interface ApiResponse<T> {
+  status: "success" | "error";
+  data: T | null;
+  message: string;
+}
+
 export interface ConverttoPDFResponse {
   url: string;
   secure_url: string;
diff --git a/src/lib/services/google-sheets.ts b/src/lib/services/google-sheets.ts
index 0adb583b..2c31f2dd 100644
--- a/src/lib/services/google-sheets.ts
+++ b/src/lib/services/google-sheets.ts
@@ -1,5 +1,5 @@
-import { google, sheets_v4 } from "googleapis";
-import { JWT } from "google-auth-library";
+import { google, type sheets_v4 } from "googleapis";
+import { type JWT } from "google-auth-library";
 
 const SCOPES = ["https://www.googleapis.com/auth/spreadsheets"];
 const SHEET_ID = process.env.SHEET_ID;
diff --git a/src/lib/services/paper.ts b/src/lib/services/paper.ts
index b2fd1463..4eb52f43 100644
--- a/src/lib/services/paper.ts
+++ b/src/lib/services/paper.ts
@@ -4,6 +4,16 @@ import { escapeRegExp } from "@/lib/utils/regex";
 import { extractUniqueValues } from "@/lib/utils/paper-aggregation";
 import { connectToDatabase } from "../database/mongoose";
 import CourseCount from "@/db/course";
+import PaperRequest from "@/db/paperRequest";
+import { type StoredSubjects } from "@/interface";
+import { transformPapersToSubjectSlots } from "@/lib/services/paper-transform";
+
+export interface CreatePaperInputType {
+  subject: string;
+  exam: string;
+  slot: string;
+  year: string;
+}
 
 export async function getPapersBySubject(subject: string) {
 	if (!subject){
@@ -47,4 +57,24 @@ export async function getCourseCounts(){
 	}));
 
 	return formatted;
+}
+
+export async function createPaperRequest({ subject, exam, slot, year} : CreatePaperInputType){
+  await connectToDatabase();
+  return await PaperRequest.create({ subject, exam, slot, year });
+}
+
+export async function getSelectedPapers() {
+	await connectToDatabase();
+  return await Paper.find({ isSelected: true }).limit(8);
+}
+
+export async function getPapersBySubjects(subjects: StoredSubjects) {
+	await connectToDatabase();
+
+  const usersPapers = await Paper.find({
+    subject: { $in: subjects },
+  });
+
+	return transformPapersToSubjectSlots(usersPapers);
 }
\ No newline at end of file
diff --git a/src/lib/services/report.ts b/src/lib/services/report.ts
index e0daac31..67e70beb 100644
--- a/src/lib/services/report.ts
+++ b/src/lib/services/report.ts
@@ -23,7 +23,7 @@ export async function reportTag(paperId: string, body: ReportTagBody) {
   await connectToDatabase(); 
   const count = await TagReport.countDocuments({ paperId });
 
-  if (count >= 5) {
+  if (count >= MAX_REPORTS_PER_PAPER) {
     throw new CustomError("Received many reports; we are currently working on it.", 429)
   }
     const reportedFields: ReportedFieldInput[] = Array.isArray(body.reportedFields)
diff --git a/src/lib/services/subject.ts b/src/lib/services/subject.ts
index b257d39a..401f456d 100644
--- a/src/lib/services/subject.ts
+++ b/src/lib/services/subject.ts
@@ -1,8 +1,10 @@
 import { connectToDatabase } from "@/lib/database/mongoose";
-import { IRelatedSubject } from "@/interface";
+import { type IRelatedSubject } from "@/interface";
 import { escapeRegExp } from "@/lib/utils/regex";
 import { Course } from "@/db/course";
 import RelatedSubject from "@/db/relatedSubjects";
+import UpcomingSubject from "@/db/upcoming-paper";
+import { checkAndSyncUpcomingSlots } from "@/lib/services/upcoming-sync";
 
 export async function getCourseList(){
 	await connectToDatabase();
@@ -17,4 +19,13 @@ export async function getRelatedSubjects(subject: string) {
 	});
 
 	return subjects[0]?.related_subjects ?? [];
+}
+
+export async function getUpcomingSubjects() {
+	await connectToDatabase();
+	await checkAndSyncUpcomingSlots();
+  return await UpcomingSubject.find()
+    .sort({ _id: 1 })
+    .limit(16)
+    .lean();
 }
\ No newline at end of file
diff --git a/src/lib/services/upcoming-sync.ts b/src/lib/services/upcoming-sync.ts
new file mode 100644
index 00000000..5f0f52be
--- /dev/null
+++ b/src/lib/services/upcoming-sync.ts
@@ -0,0 +1,104 @@
+import UpcomingSlot from "@/db/upcoming-slot";
+import UpcomingSubject from "@/db/upcoming-paper";
+import UpcomingSchedule from "@/db/upcoming-schedule";
+import CourseCount from "@/db/course";
+import slotToSubjectsData from "@/data/slot_to_subjects.json";
+import { getTodayDateInIST, isAtOrAfterCutoffInIST } from "@/lib/utils/time";
+
+const slotToSubjectsMap = slotToSubjectsData as Record<string, string[]>;
+const SLOT_ORDER = ["A", "B", "C", "D", "E", "F", "G"] as const;
+type SlotKey = (typeof SLOT_ORDER)[number];
+
+function isSlotKey(value: string): value is SlotKey {
+  return SLOT_ORDER.includes(value as SlotKey);
+}
+
+function getSelectedGroupKeys(slot: SlotKey): SlotKey[] {
+  const index = SLOT_ORDER.indexOf(slot);
+  if (index === -1) return [];
+  const current = SLOT_ORDER[index];
+  if (!current) return [];
+  if (current === "G") return ["G"];
+  const next = SLOT_ORDER[index + 1];
+  return next ? [current, next] : [current];
+}
+
+export async function checkAndSyncUpcomingSlots(): Promise<void> {
+  const today = getTodayDateInIST();
+  if (!today) return;
+
+  const currentSlotDoc = await UpcomingSlot.findOne();
+  if (currentSlotDoc?.lastSyncedDate === today) {
+    return; // Already synced today! Fast return.
+  }
+
+  // Read syncMode ("CAT" or "FAT") set once on UpcomingSlot
+  const syncMode = currentSlotDoc?.syncMode ?? "CAT";
+  if (!isAtOrAfterCutoffInIST(syncMode)) return;
+
+  const scheduleDoc = await UpcomingSchedule.findOne(
+    { date: today },
+    { _id: 0, slot: 1 },
+  ).lean<{ slot: string } | null>();
+
+  // 1. Try date schedule slot first
+  // 2. Fallback to active slot in UpcomingSlot (if no date is found in upcomingschedules)
+  const scheduledSlotRaw = scheduleDoc?.slot ?? currentSlotDoc?.slot;
+  if (!scheduledSlotRaw || !isSlotKey(scheduledSlotRaw)) return;
+  const scheduledSlot = scheduledSlotRaw;
+
+  const selectedGroupKeys = getSelectedGroupKeys(scheduledSlot);
+  if (selectedGroupKeys.length === 0) return;
+
+  const selectionLimit =
+    selectedGroupKeys.length === 1 && selectedGroupKeys[0] === "G" ? 16 : 8;
+  const targetUniqueCount = selectionLimit * selectedGroupKeys.length;
+
+  const candidateSubjects = new Set<string>();
+  for (const groupKey of selectedGroupKeys) {
+    const subSlots = [`${groupKey}1`, `${groupKey}2`];
+    for (const subSlot of subSlots) {
+      const subjects = slotToSubjectsMap[subSlot] ?? [];
+      for (const subject of subjects) {
+        candidateSubjects.add(subject);
+      }
+    }
+  }
+
+  const frequencyRows = await CourseCount.find(
+    {},
+    { _id: 0, name: 1, count: 1 },
+  ).lean<Array<{ name: string; count: number }>>();
+
+  const countMap = new Map<string, number>();
+  for (const row of frequencyRows) {
+    countMap.set(row.name, row.count);
+  }
+
+  const ranked = Array.from(candidateSubjects)
+    .map((subject) => ({
+      subject,
+      count: countMap.get(subject) ?? 0,
+      slots: Object.entries(slotToSubjectsMap)
+        .filter(([, subjects]) => subjects.includes(subject))
+        .map(([token]) => token),
+    }))
+    .sort((a, b) => b.count - a.count)
+    .slice(0, targetUniqueCount);
+
+  await UpcomingSlot.findOneAndUpdate(
+    {},
+    { $set: { slot: scheduledSlot, lastSyncedDate: today } },
+    { upsert: true, new: true, setDefaultsOnInsert: true },
+  );
+
+  await UpcomingSubject.deleteMany({});
+  if (ranked.length > 0) {
+    await UpcomingSubject.insertMany(
+      ranked.map((item) => ({
+        subject: item.subject,
+        slots: item.slots,
+      })),
+    );
+  }
+}
diff --git a/src/lib/services/upload.ts b/src/lib/services/upload.ts
new file mode 100644
index 00000000..0b7df64e
--- /dev/null
+++ b/src/lib/services/upload.ts
@@ -0,0 +1,86 @@
+import { PaperAdmin } from "@/db/papers";
+import { createPDFfromImages, compressPDF } from "@/lib/storage/pdf";
+import { uploadPDF, uploadThumbnail } from "@/lib/storage/gcp";
+import { connectToDatabase } from "@/lib/database/mongoose";
+
+const MAX_COMPRESSED_PDF_SIZE = 5 * 1024 * 1024; // 5MB compressed
+const COMPRESS_THRESHOLD = 5 * 1024 * 1024; // 5MB
+
+type UploadPaperInput = {
+  files: File[];
+  isPdf: boolean;
+  thumbnail: File | null;
+  campus: string | null;
+};
+
+type UploadPaperResult =
+  | { success: true; file_url: string; thumbnail_url: string | null }
+  | { success: false; message: string; status: number };
+
+export async function uploadPaper({
+  files,
+  isPdf,
+  thumbnail,
+  campus,
+}: UploadPaperInput): Promise<UploadPaperResult> {
+  await connectToDatabase();
+  
+  let pdfBytes: Uint8Array;
+
+  if (isPdf) {
+    if (!files[0]) {
+      return { success: false, message: "No PDF file provided.", status: 400 };
+    }
+
+    if (files[0].size > COMPRESS_THRESHOLD) {
+      return {
+        success: false,
+        message: "PDF file exceeds the 5MB limit. Please select a PDF file under 5MB.",
+        status: 400,
+      };
+    }
+
+    const rawPdfBytes = new Uint8Array(await files[0].arrayBuffer());
+    pdfBytes = await compressPDF(rawPdfBytes);
+    if (pdfBytes.length > MAX_COMPRESSED_PDF_SIZE) {
+      return {
+        success: false,
+        message: "PDF is too large after compression. The compressed file must be under 5MB.",
+        status: 413,
+      };
+    }
+  } else {
+    pdfBytes = await createPDFfromImages(files);
+    if (pdfBytes.length > MAX_COMPRESSED_PDF_SIZE) {
+      return {
+        success: false,
+        message: "Generated PDF is too large after compression. Please upload fewer or smaller images.",
+        status: 413,
+      };
+    }
+  }
+
+  const buffer = Buffer.from(pdfBytes);
+  const file_url = await uploadPDF("unapproved", buffer);
+
+  let thumbnail_url: string | null = null;
+  if (thumbnail) {
+    const thumbBuffer = Buffer.from(await thumbnail.arrayBuffer());
+    thumbnail_url = await uploadThumbnail(thumbBuffer, file_url);
+  }
+
+  const paper = new PaperAdmin({
+    file_url,
+    thumbnail_url,
+    campus,
+    subject: null,
+    slot: null,
+    year: null,
+    exam: null,
+    semester: null,
+    ambiguous_tags: [],
+  });
+  await paper.save();
+
+  return { success: true, file_url, thumbnail_url };
+}
diff --git a/src/lib/storage/pdf.ts b/src/lib/storage/pdf.ts
index 2904bbff..0f736a1a 100644
--- a/src/lib/storage/pdf.ts
+++ b/src/lib/storage/pdf.ts
@@ -1,20 +1,47 @@
 import { PDFDocument } from "pdf-lib";
+import { createCanvas, loadImage } from "canvas";
+
+const DEFAULT_PDF_SAVE_OPTIONS = {
+  useObjectStreams: true,
+  compress: true,
+};
+const MAX_IMAGE_DIMENSION = 1600;
+const JPEG_QUALITY = 0.72;
+
+async function normalizeImage(file: File) {
+  const rawBytes = Buffer.from(await file.arrayBuffer());
+  const image = await loadImage(rawBytes);
+
+  const originalWidth = image.width;
+  const originalHeight = image.height;
+  const scale = Math.min(1, MAX_IMAGE_DIMENSION / Math.max(originalWidth, originalHeight));
+  const width = Math.max(1, Math.round(originalWidth * scale));
+  const height = Math.max(1, Math.round(originalHeight * scale));
+
+  const canvas = createCanvas(width, height);
+  const ctx = canvas.getContext("2d");
+  ctx.drawImage(image, 0, 0, width, height);
+
+  return canvas.toBuffer("image/jpeg", {
+    quality: JPEG_QUALITY,
+    chromaSubsampling: true,
+  });
+}
 
 export async function createPDFfromImages(files: File[]): Promise<Uint8Array> {
   const pdfDoc = await PDFDocument.create();
 
   for (const file of files) {
-    const imgBytes = Buffer.from(await file.arrayBuffer());
-    let img;
-    if (file.type === "image/png") {
-      img = await pdfDoc.embedPng(imgBytes);
-    } else if (file.type === "image/jpeg" || file.type === "image/jpg") {
-      img = await pdfDoc.embedJpg(imgBytes);
-    } else continue;
-
+    const normalizedBytes = await normalizeImage(file);
+    const img = await pdfDoc.embedJpg(normalizedBytes);
     const page = pdfDoc.addPage([img.width, img.height]);
     page.drawImage(img, { x: 0, y: 0, width: img.width, height: img.height });
   }
 
-  return pdfDoc.save();
+  return pdfDoc.save(DEFAULT_PDF_SAVE_OPTIONS);
+}
+
+export async function compressPDF(pdfBytes: Uint8Array): Promise<Uint8Array> {
+  const pdfDoc = await PDFDocument.load(pdfBytes, { ignoreEncryption: true });
+  return pdfDoc.save(DEFAULT_PDF_SAVE_OPTIONS);
 }
diff --git a/src/lib/utils/download.ts b/src/lib/utils/download.ts
index d8fe573e..e72072ab 100644
--- a/src/lib/utils/download.ts
+++ b/src/lib/utils/download.ts
@@ -1,4 +1,4 @@
-import { IPaper } from "../../interface";
+import { type IPaper } from "../../interface";
 import { extractBracketContent } from "./string";
 import axios from "axios";
 
diff --git a/src/lib/utils/error.ts b/src/lib/utils/error.ts
index f4b18908..7340d70d 100644
--- a/src/lib/utils/error.ts
+++ b/src/lib/utils/error.ts
@@ -1,4 +1,4 @@
-import { NextResponse } from "next/server";
+import { failure } from "@/lib/utils/response"
 
 export class CustomError extends Error {
     status: number;
@@ -12,14 +12,8 @@ export class CustomError extends Error {
 
 export function customErrorHandler(error: unknown, defaultMessage: string) {
     if (error instanceof CustomError) {
-        return NextResponse.json(
-            {message: error.message},
-            {status: error.status}
-        );
+        return failure(error.message, error.status);
     } else {
-        return NextResponse.json(
-            {message: defaultMessage},
-            {status: 500}
-        );
+        return failure(defaultMessage, 500)
     }
 }
diff --git a/src/lib/utils/response.ts b/src/lib/utils/response.ts
new file mode 100644
index 00000000..83681d50
--- /dev/null
+++ b/src/lib/utils/response.ts
@@ -0,0 +1,21 @@
+import { NextResponse } from "next/server"
+import { type ApiResponse } from '@/interface'
+
+export const success = <T>(
+  data: T,
+  message = "OK",
+  status = 200
+) =>
+  NextResponse.json<ApiResponse<T>>(
+    { status: "success", data, message },
+    { status }
+  );
+
+export const failure = <T>(
+  message: string,
+  status = 400,
+) =>
+  NextResponse.json<ApiResponse<T>>(
+    { status: "error", data: null, message},
+    { status }
+  )
\ No newline at end of file
diff --git a/src/lib/utils/time.ts b/src/lib/utils/time.ts
new file mode 100644
index 00000000..7d4441d2
--- /dev/null
+++ b/src/lib/utils/time.ts
@@ -0,0 +1,44 @@
+export function getTodayDateInIST(): string {
+  const parts = new Intl.DateTimeFormat("en-CA", {
+    timeZone: "Asia/Kolkata",
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+  }).formatToParts(new Date());
+
+  const year = parts.find((part) => part.type === "year")?.value;
+  const month = parts.find((part) => part.type === "month")?.value;
+  const day = parts.find((part) => part.type === "day")?.value;
+
+  if (!year || !month || !day) return "";
+  return `${year}-${month}-${day}`;
+}
+
+export function isAtOrAfterCutoffInIST(examType: "CAT" | "FAT" = "CAT"): boolean {
+  const parts = new Intl.DateTimeFormat("en-GB", {
+    timeZone: "Asia/Kolkata",
+    hour: "2-digit",
+    minute: "2-digit",
+    hour12: false,
+  }).formatToParts(new Date());
+
+  const hour = parts.find((part) => part.type === "hour")?.value;
+  const minute = parts.find((part) => part.type === "minute")?.value;
+
+  if (!hour || !minute) return false;
+  const hourNumber = Number.parseInt(hour, 10);
+  const minuteNumber = Number.parseInt(minute, 10);
+  if (Number.isNaN(hourNumber) || Number.isNaN(minuteNumber)) return false;
+
+  if (examType === "FAT") {
+    // Trigger after 9:30 AM IST for FAT exams
+    return hourNumber > 9 || (hourNumber === 9 && minuteNumber >= 30);
+  }
+
+  // Trigger after 2:00 PM IST (14:00) for CAT exams (default)
+  return hourNumber > 14 || (hourNumber === 14 && minuteNumber >= 0);
+}
+
+export function isAtOrAfterTwoPMInIST(): boolean {
+  return isAtOrAfterCutoffInIST("CAT");
+}
diff --git a/src/middleware.ts b/src/middleware.ts
index 6e5fa642..42cd0362 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -4,6 +4,7 @@ import {
   paperRequestRatelimit,
   subscribeRatelimit,
 } from "./lib/utils/ratelimit";
+import { failure } from "@/lib/utils/response"
 
 export const config = {
   matcher: ["/api/upload", "/api/request", "/api/subscribe"],
@@ -16,30 +17,21 @@ export default async function middleware(request: NextRequest) {
   if (pathname === "/api/upload") {
     const { success } = await aiUploadRatelimit.limit(ip);
     if (!success) {
-      return NextResponse.json(
-        { message: "You can upload a maximum of 5 papers every 15 minutes" },
-        { status: 429 },
-      );
+      return failure("You can upload a maximum of 5 papers every 15 minutes", 429);
     }
   }
 
   if (pathname === "/api/request") {
     const { success } = await paperRequestRatelimit.limit(ip);
     if (!success) {
-      return NextResponse.json(
-        { message: "You can submit a maximum of 5 requests every 15 minutes" },
-        { status: 429 },
-      );
+      return failure("You can submit a maximum of 5 requests every 15 minutes", 429);
     }
   }
 
   if (pathname === "/api/subscribe") {
     const { success } = await subscribeRatelimit.limit(ip);
     if (!success) {
-      return NextResponse.json(
-        { message: "Maximum of 3 newsletter subscriptions per hour" },
-        { status: 429 },
-      );
+      return failure("Maximum of 3 newsletter subscriptions per hour", 429);
     }
   }