diff --git a/src/app/(app)/page.tsx b/src/app/(app)/page.tsx
index 3b42a60..412fc38 100644
--- a/src/app/(app)/page.tsx
+++ b/src/app/(app)/page.tsx
@@ -3,15 +3,13 @@
 import { useDevice } from "@/lib/context/DeviceContext";
 
 function Mobile() {
-	const { session } = useDevice();
-	let isAuthenticated = session == null ? false : true;
+	const { isAuthenticated, session } = useDevice();
 
 	return (
 		<main className="flex flex-col gap-[32px] row-start-2 items-center mt-10">
 			<h1 className="text-3xl sm:text-4xl font-bold tracking-[-.01em] text-center sm:text-left">
-				Welcome, {session?.name || "NULL"} !!
+				Welcome, {isAuthenticated ? session.name : ""} !!
 			</h1>
-
 			{isAuthenticated ? (
 				<div>
 					<button type="button" className="btn bg-surface-500">
@@ -33,13 +31,12 @@ function Mobile() {
 }
 
 function Web() {
-	const { session } = useDevice();
-	let isAuthenticated = session == null ? false : true;
+	const { isAuthenticated, session } = useDevice();
 
 	return (
 		<main className="flex flex-col row-start-2 items-center mt-10">
 			<h1 className="text-3xl sm:text-4xl font-bold tracking-[-.01em] text-center sm:text-left">
-				Welcome, {session?.name || "NULL"} !!
+				Welcome, {isAuthenticated ? session.name : ""} !!
 			</h1>
 
 			{isAuthenticated ? (
diff --git a/src/app/api/index.js b/src/app/api/index.js
index a34bd2d..9c36c93 100644
--- a/src/app/api/index.js
+++ b/src/app/api/index.js
@@ -1,10 +1,13 @@
+import { db } from "../../lib/scripts/db";
+
 export default function handler(req, res) {
-  if (req.method === 'GET') {
-    // Handle GET request
-    res.status(200).json({ message: 'Hello, this is a GET request!' });
-  } else {
-    // Handle unsupported methods
-    res.setHeader('Allow', ['GET']);
-    res.status(405).end(`Method ${req.method} Not Allowed`);
-  }
+	if (req.method === 'GET') {
+
+		// Handle GET request
+		res.status(200).json({ message: 'Hello, this is a GET request!' });
+	} else {
+		// Handle unsupported methods
+		res.setHeader('Allow', ['GET']);
+		res.status(405).end(`Method ${req.method} Not Allowed`);
+	}
 }
\ No newline at end of file
diff --git a/src/app/auth/session/route.ts b/src/app/auth/session/route.ts
index 2a67d3e..cb74f68 100644
--- a/src/app/auth/session/route.ts
+++ b/src/app/auth/session/route.ts
@@ -1,5 +1,5 @@
 import { NextResponse } from "next/server";
-import { auth0 } from "../../../lib/auth0";
+import { auth0 } from "../../../lib/scripts/auth0";
 
 export async function GET() {
 	try {
diff --git a/src/lib/connectDB.js b/src/lib/connectDB.js
deleted file mode 100644
index d5be20a..0000000
--- a/src/lib/connectDB.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import mongoose from "mongoose";
-
-const DATABASE_URL = process.env.DATABASE_URL;
-
-if (!DATABASE_URL) {
-  throw new Error("Please define the DATABASE_URL environment variable inside .env.local");
-}
-
-let cached = global.mongoose;
-
-if (!cached) {
-  cached = global.mongoose = { conn: null, promise: null };
-}
-
-async function connectDB() {
-  if (cached.conn) {
-    return cached.conn;
-  }
-
-  if (!cached.promise) {
-    const opts = {
-      bufferCommands: false,
-    };
-
-    cached.promise = mongoose.connect(DATABASE_URL, opts).then((mongoose) => {
-      return mongoose;
-    });
-  }
-  cached.conn = await cached.promise;
-  return cached.conn;
-}
-
-export default connectDB;
\ No newline at end of file
diff --git a/src/lib/context/DeviceContext.tsx b/src/lib/context/DeviceContext.tsx
index 42967a4..2edaf8f 100644
--- a/src/lib/context/DeviceContext.tsx
+++ b/src/lib/context/DeviceContext.tsx
@@ -7,6 +7,7 @@ interface DeviceContextProps {
     isSafari: boolean;
     isMobile: boolean;  
     session: any | null;
+    isAuthenticated: boolean;
 }
 
 const DeviceContext = createContext<DeviceContextProps | undefined>(undefined);
@@ -16,6 +17,8 @@ export const DeviceProvider: React.FC<{ children: React.ReactNode }> = ({ childr
     const [isMobile, setIsMobile] = useState<boolean>(false);
     const [session, setSession] = useState<any>(null);
 
+    const isAuthenticated = !!session;
+
     useEffect(() => {
         setIsSafari(rdd.isSafari);
         setIsMobile(rdd.isMobile);
@@ -35,7 +38,7 @@ export const DeviceProvider: React.FC<{ children: React.ReactNode }> = ({ childr
     }, []);
 
     return (
-        <DeviceContext.Provider value={{ isSafari, isMobile, session }}>
+        <DeviceContext.Provider value={{ isSafari, isMobile, session, isAuthenticated }}>
             {children}
         </DeviceContext.Provider>
     );
diff --git a/src/lib/auth0.ts b/src/lib/scripts/auth0.ts
similarity index 100%
rename from src/lib/auth0.ts
rename to src/lib/scripts/auth0.ts
diff --git a/src/lib/scripts/db.js b/src/lib/scripts/db.js
new file mode 100644
index 0000000..0e7c639
--- /dev/null
+++ b/src/lib/scripts/db.js
@@ -0,0 +1,21 @@
+import mongoose from "mongoose";
+
+
+class DB {
+
+	constructor() {
+        this.connect();
+        
+    }
+
+	connect() {
+		if (!process.env.DATABASE_URL) {
+			throw new Error("Please define the DATABASE_URL environment variable inside .env.local");
+		}
+        mongoose.set('strictQuery', true);
+        mongoose.connect(process.env.DATABASE_URL).then(() => { console.log("Connected to DataBase") });
+    }  
+
+}
+
+export const db = new DB();
\ No newline at end of file
diff --git a/src/middleware.ts b/src/middleware.ts
index 6b63ae0..a0f1b5e 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,5 +1,5 @@
 import type { NextRequest } from "next/server";
-import { auth0 } from "./lib/auth0";
+import { auth0 } from "./lib/scripts/auth0";
 
 export async function middleware(request: NextRequest) {
   return await auth0.middleware(request);