diff --git a/api/status/status.js b/api/status/status.js
index 6776a6f..44245ed 100644
--- a/api/status/status.js
+++ b/api/status/status.js
@@ -1,5 +1,7 @@
+
 const express = require("express");
 const ping = require("ping");
+const pm2 = require("pm2");
 
 const router = express.Router();
 
@@ -20,26 +22,112 @@ REMOTE_SERVERS.forEach(server => {
     };
 });
 
+// Add PM2 services status object
+let pm2ServicesStatus = {};
+
 async function checkServers() {
-    for (const server of REMOTE_SERVERS) {
-        const startTime = Date.now();
-        try {
-            const res = await ping.promise.probe(server.host);
-            serversStatus[server.name].online = res.alive;
-            serversStatus[server.name].responseTime = res.time;
-        } catch (error) {
-            serversStatus[server.name].online = false;
-            serversStatus[server.name].responseTime = null;
+    try {
+        for (const server of REMOTE_SERVERS) {
+            try {
+                const res = await ping.promise.probe(server.host, {
+                    timeout: 2, // Set a timeout of 2 seconds
+                });
+                serversStatus[server.name].online = res.alive;
+                serversStatus[server.name].responseTime = res.time;
+            } catch (error) {
+                console.error(`Error pinging ${server.host}:`, error);
+                serversStatus[server.name].online = false;
+                serversStatus[server.name].responseTime = null;
+            }
+            serversStatus[server.name].lastChecked = new Date().toISOString();
         }
-        serversStatus[server.name].lastChecked = new Date().toISOString();
+    } catch (error) {
+        console.error("Error in checkServers function:", error);
     }
 }
 
-setInterval(checkServers, CHECK_INTERVAL);
-checkServers();
+async function checkPM2Services() {
+    return new Promise((resolve, reject) => {
+        pm2.connect(function(err) {
+            if (err) {
+                console.error('Error connecting to PM2:', err);
+                pm2.disconnect();
+                resolve();
+                return;
+            }
+            
+            pm2.list((err, list) => {
+                if (err) {
+                    console.error('Error getting PM2 process list:', err);
+                    pm2.disconnect();
+                    resolve();
+                    return;
+                }
+                
+                // Update PM2 services status
+                list.forEach(process => {
+                    pm2ServicesStatus[process.name] = {
+                        name: process.name,
+                        id: process.pm_id,
+                        status: process.pm2_env.status,
+                        cpu: process.monit ? process.monit.cpu : null,
+                        memory: process.monit ? process.monit.memory : null,
+                        uptime: process.pm2_env.pm_uptime ? 
+                               Date.now() - process.pm2_env.pm_uptime : 
+                               null,
+                        restarts: process.pm2_env.restart_time,
+                        lastChecked: new Date().toISOString()
+                    };
+                });
+                
+                pm2.disconnect();
+                resolve();
+            });
+        });
+    });
+}
 
+async function checkAll() {
+    try {
+        await checkServers();
+        await checkPM2Services();
+    } catch (error) {
+        console.error("Error in checkAll function:", error);
+    }
+}
+
+// Initial check with error handling
+try {
+    checkAll();
+} catch (error) {
+    console.error("Error during initial check:", error);
+}
+
+// Set interval with error handling
+setInterval(() => {
+    try {
+        checkAll();
+    } catch (error) {
+        console.error("Error during scheduled check:", error);
+    }
+}, CHECK_INTERVAL);
+
+// Route with error handling
 router.get("/", (req, res) => {
-    res.json(serversStatus);
+    try {
+        res.json({
+            servers: serversStatus,
+            pm2Services: pm2ServicesStatus
+        });
+    } catch (error) {
+        console.error("Error sending status response:", error);
+        res.status(500).json({ error: "Internal server error" });
+    }
 });
 
-module.exports = router;
\ No newline at end of file
+// Add a simple health check endpoint
+router.get("/health", (req, res) => {
+    res.status(200).send("OK");
+});
+
+module.exports = router;