diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
index 650a92a..2ed69bc 100644
--- a/src/auth/auth.service.ts
+++ b/src/auth/auth.service.ts
@@ -235,7 +235,7 @@ export class AuthService {
       console.log("Error in introspectToken:", error.message || error);
 
       if (error instanceof UnauthorizedException || error instanceof jwt.TokenExpiredError || error instanceof jwt.JsonWebTokenError || error instanceof jwt.NotBeforeError) {
-        throw new UnauthorizedException('Authentication failed');
+        throw new UnauthorizedException('Invalid Token');
       }
 
       throw new InternalServerErrorException('Failed to introspect token');
diff --git a/src/guards/jwt-auth.guard.ts b/src/guards/jwt-auth.guard.ts
index 794ca52..71e7a3d 100644
--- a/src/guards/jwt-auth.guard.ts
+++ b/src/guards/jwt-auth.guard.ts
@@ -25,18 +25,18 @@ export class JwtAuthGuard implements CanActivate {
     }
 
     // Decode the token without verifying the signature
-    const decoded = jwt.decode(token) as { exp?: number };
+    // const decoded = jwt.decode(token) as { exp?: number };
 
-    if (!decoded || !decoded.exp) {
-      throw new UnauthorizedException('Authentication failed');
-    }
+    // if (!decoded || !decoded.exp) {
+    //   throw new UnauthorizedException('Authentication failed');
+    // }
 
-    const currentTime = Math.floor(Date.now() / 1000); // in seconds
+    // const currentTime = Math.floor(Date.now() / 1000); // in seconds
 
-    if (decoded.exp < currentTime) {
-      console.log('Token expired');
-      throw new UnauthorizedException('Invalid Token');
-    }
+    // if (decoded.exp < currentTime) {
+    //   console.log('Token expired');
+    //   throw new UnauthorizedException('Invalid Token');
+    // }
 
     // Token is valid and not expired - continue with your normal logic
     try {
@@ -44,6 +44,10 @@ export class JwtAuthGuard implements CanActivate {
       request.user = verifiedUser;
       return true;
     } catch (error) {
+      if (error instanceof jwt.TokenExpiredError || error instanceof jwt.JsonWebTokenError || error instanceof jwt.NotBeforeError) {
+        throw new UnauthorizedException('Invalid Token');
+      }
+
       if (error instanceof UnauthorizedException || error instanceof UE) {
         throw error;
       }
diff --git a/src/main.ts b/src/main.ts
index fc815fe..2b0d996 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -14,7 +14,13 @@ async function bootstrap() {
     logger: ['error', 'warn'],
     cors: {
       // origin: 'https://dev.alphaomegainfosys.com/',
-      origin: ['http://localhost:3000', 'http://localhost:5173'],
+      origin: [
+        'http://localhost:3000', 
+        'http://localhost:5173',
+        'https://policy.alphaomegainfosys.com',
+        'https://sp.alphaomegainfosys.com',
+        'https://client.alphaomegainfosys.com'
+      ],
       methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
       preflightContinue: false,
       optionsSuccessStatus: 204,