diff --git a/src/index.ts b/src/index.ts
index 176a97d..05fa045 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -7,7 +7,7 @@ import cors from "@koa/cors";
 import * as cron from "node-cron";
 import {MongoClient, ObjectId} from "mongodb";
 
-import { MangoClient, IDS } from '@blockworks-foundation/mango-client';
+import { MangoClient, MarginAccount, IDS } from '@blockworks-foundation/mango-client';
 import { Connection, PublicKey } from '@solana/web3.js';
 
 import { UserError } from './errors';
@@ -25,6 +25,7 @@ const client = new MangoClient();
 const clusterIds = IDS[cluster];
 const connection = new Connection(config.rpcEndpoint || IDS.cluster_urls[cluster], 'singleGossip');
 const dexProgramId = new PublicKey(clusterIds.dex_program_id);
+const mangoProgramId = new PublicKey(clusterIds.mango_program_id);
 
 app.use(cors());
 app.use(bodyParser());
@@ -104,14 +105,15 @@ app.listen(config.port, () => {
 
 const handleAlert = async (alert: any, mangoGroups: any[], db: any) => {
   try {
+    const mangoGroupMapping = mangoGroups[alert.mangoGroupPk];
     const marginAccountPk = new PublicKey(alert.marginAccountPk);
-    const marginAccount = await client.getMarginAccount(connection, marginAccountPk, dexProgramId);
-    const collateralRatio = marginAccount.getCollateralRatio(mangoGroups[alert.mangoGroupPk]['mangoGroup'], mangoGroups[alert.mangoGroupPk]['prices']);
+    const marginAccount = mangoGroupMapping.marginAccounts.find((ma: MarginAccount) => ma.publicKey.equals(marginAccountPk));
+    const collateralRatio = marginAccount.getCollateralRatio(mangoGroupMapping['mangoGroup'], mangoGroupMapping['prices']);
     if ((100 * collateralRatio) <= alert.collateralRatioThresh) {
       let message = MESSAGE.replace('@ratio@', alert.collateralRatioThresh);
       message += marginAccount.toPrettyString(
-        mangoGroups[alert.mangoGroupPk]['mangoGroup'],
-        mangoGroups[alert.mangoGroupPk]['prices']
+        mangoGroupMapping['mangoGroup'],
+        mangoGroupMapping['prices']
       );
       message += '\nVisit https://trade.mango.markets/'
       const alertSent = await sendAlert(alert, message);
@@ -131,7 +133,7 @@ const runCron = async () => {
     try {
       const alerts = await db.collection('alerts').find({open: true}).toArray();
       const uniqueMangoGroupPks: string[] = [...new Set(alerts.map(alert => alert.mangoGroupPk))];
-      const mangoGroups:any = await reduceMangoGroups(client, connection, uniqueMangoGroupPks);
+      const mangoGroups:any = await reduceMangoGroups(client, connection, mangoProgramId, uniqueMangoGroupPks);
       alerts.forEach(async (alert) => {
         handleAlert(alert, mangoGroups, db);
       });
diff --git a/src/utils.ts b/src/utils.ts
index 773d19c..53aae98 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -92,12 +92,14 @@ export const sendAlert = async (alert: any, message: string) => {
   return true;
 }
 
-export const reduceMangoGroups = async (client: MangoClient, connection: Connection, mangoGroupPks: string[]) => {
+export const reduceMangoGroups = async (client: MangoClient, connection: Connection, mangoProgramId: PublicKey, mangoGroupPks: string[]) => {
   const mangoGroups:any = {};
   for (let mangoGroupPk of mangoGroupPks) {
     const mangoGroup = await client.getMangoGroup(connection, new PublicKey(mangoGroupPk));
+    const marginAccounts = await client.getAllMarginAccounts(connection, mangoProgramId, mangoGroup);
     mangoGroups[mangoGroupPk] = {
       mangoGroup,
+      marginAccounts,
       prices: await mangoGroup.getPrices(connection),
     };
   }