diff --git a/examples/oobee-cypress-integration-js/cypress.config.js b/examples/oobee-cypress-integration-js/cypress.config.js
index 5ee1a137..0df5d036 100644
--- a/examples/oobee-cypress-integration-js/cypress.config.js
+++ b/examples/oobee-cypress-integration-js/cypress.config.js
@@ -1,5 +1,8 @@
 import { defineConfig } from "cypress";
 import oobeeA11yInit from "@govtechsg/oobee";
+import fs from 'fs-extra';
+import { glob } from 'glob';
+import path from 'path';
 
 // viewport used in tests to optimise screenshots
 const viewportSettings = { width: 1920, height: 1040 };
@@ -15,7 +18,7 @@ const oobeeA11y = await oobeeA11yInit({
   testLabel: "Demo Cypress Scan", // label for test
   name: "Your Name",
   email: "email@domain.com",
-  includeScreenshots: true, // include screenshots of affected elements in the report
+  includeScreenshots: false, // include screenshots of affected elements in the report
   viewportSettings,
   thresholds,
   scanAboutMetadata,
@@ -56,6 +59,24 @@ export default defineConfig({
         async terminateOobeeA11y() {
           return await oobeeA11y.terminate();
         },
+        returnOobeeRandomTokenAndPage() {
+          return {
+            randomToken: oobeeA11y.randomToken,
+            // page: `${String(oobeeA11y.scanDetails.urlsCrawled.scanned.length).padStart(9, '0')}.json`,
+          };
+        },
+        copyFiles({fromPattern, toDir}) {
+          !fs.existsSync(toDir) && fs.mkdirSync(toDir, {recursive: true});
+
+          const files = glob.sync(fromPattern);
+
+          for (const file of files) {
+            const to = path.join(toDir, path.basename(file));
+            fs.copyFileSync(file, to);
+          }
+
+          return null;
+        },
       });
     },
   },
diff --git a/examples/oobee-cypress-integration-js/cypress/e2e/spec.cy.js b/examples/oobee-cypress-integration-js/cypress/e2e/spec.cy.js
index cc359176..8a15a757 100644
--- a/examples/oobee-cypress-integration-js/cypress/e2e/spec.cy.js
+++ b/examples/oobee-cypress-integration-js/cypress/e2e/spec.cy.js
@@ -1,19 +1,27 @@
-describe("template spec", () => {
-  it("should run oobee A11y", () => {
-    cy.visit(
-      "https://govtechsg.github.io/purple-banner-embeds/purple-integrated-scan-example.htm"
-    );
+describe('template spec', () => {
+  beforeEach(() => {
+    cy.visit('https://govtechsg.github.io/purple-banner-embeds/purple-integrated-scan-example.htm');
     cy.injectOobeeA11yScripts();
-    cy.runOobeeA11yScan();
-    
-    cy.get("button[onclick=\"toggleSecondSection()\"]").click();
-    // Run a scan on <input> and <button> elements
-    cy.runOobeeA11yScan({
-      elementsToScan: ["input", "button"],
-      elementsToClick: ["button[onclick=\"toggleSecondSection()\"]"],
-      metadata: "Clicked button"
-    });
+  });
 
+  after(() => {
     cy.terminateOobeeA11y();
   });
+
+  it('should not have WCAG violations in first section', () => {
+    cy.runOobeeA11yScan({}, { mustFix: 10 });
+  });
+
+  it('should not have WCAG violations in second section', () => {
+    cy.get('button[onclick="toggleSecondSection()"]').click();
+    // Run a scan on <input> and <button> elements
+    cy.runOobeeA11yScan(
+      {
+        elementsToScan: ['input', 'button'],
+        elementsToClick: ['button[onclick="toggleSecondSection()"]'],
+        metadata: 'Clicked button',
+      },
+      { mustFix: 1 },
+    );
+  });
 });
diff --git a/examples/oobee-cypress-integration-js/cypress/support/e2e.js b/examples/oobee-cypress-integration-js/cypress/support/e2e.js
index ea0a1c51..8008237a 100644
--- a/examples/oobee-cypress-integration-js/cypress/support/e2e.js
+++ b/examples/oobee-cypress-integration-js/cypress/support/e2e.js
@@ -1,73 +1,169 @@
-Cypress.Commands.add("injectOobeeA11yScripts", () => {
-    cy.task("getAxeScript").then((s) => {
-        cy.window().then((win) => {
-            try {
-                win.eval(s);
-            }
-            catch (error) {
-                // If eval fails due to cross-origin issues, try alternative injection
-                if (error.message.includes('SecurityError') || error.message.includes('cross-origin')) {
-                    cy.log('Cross-origin error detected, attempting alternative script injection');
-                    // Create a script tag as fallback
-                    const script = win.document.createElement('script');
-                    script.textContent = s;
-                    win.document.head.appendChild(script);
-                }
-                else {
-                    throw error;
-                }
-            }
-        });
+import 'cypress-if';
+
+Cypress.Commands.add('injectOobeeA11yScripts', () => {
+  cy.task('getAxeScript').then(s => {
+    cy.window().then(win => {
+      try {
+        win.eval(s);
+      } catch (error) {
+        // If eval fails due to cross-origin issues, try alternative injection
+        if (error.message.includes('SecurityError') || error.message.includes('cross-origin')) {
+          cy.log('Cross-origin error detected, attempting alternative script injection');
+          // Create a script tag as fallback
+          const script = win.document.createElement('script');
+          script.textContent = s;
+          win.document.head.appendChild(script);
+        } else {
+          throw error;
+        }
+      }
     });
-    cy.task("getOobeeA11yScripts").then((s) => {
-        cy.window().then((win) => {
-            try {
-                win.eval(s);
-            }
-            catch (error) {
-                // If eval fails due to cross-origin issues, try alternative injection
-                if (error.message.includes('SecurityError') || error.message.includes('cross-origin')) {
-                    cy.log('Cross-origin error detected, attempting alternative script injection');
-                    // Create a script tag as fallback
-                    const script = win.document.createElement('script');
-                    script.textContent = s;
-                    win.document.head.appendChild(script);
-                }
-                else {
-                    throw error;
-                }
-            }
-        });
+  });
+  cy.task('getOobeeA11yScripts').then(s => {
+    cy.window().then(win => {
+      try {
+        win.eval(s);
+      } catch (error) {
+        // If eval fails due to cross-origin issues, try alternative injection
+        if (error.message.includes('SecurityError') || error.message.includes('cross-origin')) {
+          cy.log('Cross-origin error detected, attempting alternative script injection');
+          // Create a script tag as fallback
+          const script = win.document.createElement('script');
+          script.textContent = s;
+          win.document.head.appendChild(script);
+        } else {
+          throw error;
+        }
+      }
     });
+  });
 });
 
-Cypress.Commands.add("runOobeeA11yScan", (items = {}) => {
-  cy.window().then(async (win) => {
+Cypress.Commands.add('runOobeeA11yScan', (items = {}, threshold = {}) => {
+  cy.window().then(async win => {
     const { elementsToScan, elementsToClick, metadata } = items;
 
     // extract text from the page for readability grading
     const sentences = win.extractText();
     // run readability grading separately as it cannot be done within the browser context
-    cy.task("gradeReadability", sentences).then(
-      async (gradingReadabilityFlag) => {
-        // passing the grading flag to runA11yScan to inject violation as needed
-        const res = await win.runA11yScan(
-          elementsToScan,
-          gradingReadabilityFlag,
-        );
-        cy.task("pushOobeeA11yScanResults", {
-          res,
-          metadata,
-          elementsToClick,
-        }).then((count) => {
-          return count;
+    cy.task('gradeReadability', sentences).then(async gradingReadabilityFlag => {
+      // passing the grading flag to runA11yScan to inject violation as needed
+      const res = await win.runA11yScan(elementsToScan, gradingReadabilityFlag);
+
+      const takeOobeeScreenshotsFromCypressForMustFix =
+        Cypress.env('takeOobeeScreenshotsFromCypressForMustFix') || true;
+      const takeOobeeScreenshotsFromCypressForGoodToFix =
+        Cypress.env('takeOobeeScreenshotsFromCypressForGoodToFix') || true;
+
+      let shouldTakeScreenshot;
+      let oobeeReportPath;  
+
+      // take screenshot and move to report dir
+      cy.wrap()
+        .then(() => {
+          cy.task('returnOobeeRandomTokenAndPage').then(({ randomToken }) => {
+            oobeeReportPath = randomToken;
+          });
+        })
+        .then(() => {
+          // Take screenshots based on flags and violation severity
+          if (
+            (takeOobeeScreenshotsFromCypressForMustFix ||
+              takeOobeeScreenshotsFromCypressForGoodToFix) &&
+            res.axeScanResults.violations.length > 0
+          ) {
+            const violations = res.axeScanResults.violations;
+            violations.forEach(violation => {
+              violation.nodes.forEach((node, nodeIndex) => {
+                const selector = node.target && node.target[0];
+                const timestamp = Date.now() * 1000000 + Math.floor(Math.random() * 1000000); // Epoch time in nanoseconds
+                const screenshotFileName = `${node.impact}_${violation.id}_node_${nodeIndex}_${timestamp}`;
+                const screenshotPath = `elemScreenshots/html/${screenshotFileName}`;
+                const fullScreenshotPath = `${oobeeReportPath}/${screenshotPath}`;
+
+                if (selector) {
+                  // Determine if we should take screenshot based on impact level
+                  shouldTakeScreenshot =
+                    (takeOobeeScreenshotsFromCypressForMustFix &&
+                      (node.impact === 'critical' || node.impact === 'serious')) ||
+                    (takeOobeeScreenshotsFromCypressForGoodToFix &&
+                      (node.impact === 'moderate' || node.impact === 'minor'));
+
+                  if (shouldTakeScreenshot) {
+                    takeScreenshotForHTMLElements(fullScreenshotPath, selector);
+                    node.screenshotPath = screenshotPath + '.png';
+                  }
+                }
+              });
+            });
+          }
+        })
+        .then(() => {
+          // move screenshots to report dir
+          if (
+            takeOobeeScreenshotsFromCypressForMustFix ||
+            takeOobeeScreenshotsFromCypressForGoodToFix
+          ) {
+            cy.task('returnOobeeRandomTokenAndPage').then(({ randomToken }) => {
+              // const screenshotDir = `cypress/screenshots/${randomToken}/elemScreenshots/html`;
+              const screenshotPattern = `cypress/screenshots/**/elemScreenshots/html/*.png`;
+              const toReportDir = `results/${randomToken}/elemScreenshots/html`;
+              cy.task('copyFiles', {
+                fromPattern: screenshotPattern,
+                toDir: toReportDir,
+              });
+            });
+          }
+        })
+        .then(() => {
+          cy.task('pushOobeeA11yScanResults', {
+            res,
+            metadata,
+            elementsToClick,
+          }).then(count => {
+            // validate the count against the thresholds
+            handleViolation(count, threshold);
+            return count;
+          });
         });
-      },
-    );
-    cy.task("finishOobeeA11yTestCase"); // test the accumulated number of issue occurrences against specified thresholds. If exceed, terminate oobeeA11y instance.
+    });
+    cy.task('finishOobeeA11yTestCase'); // test the accumulated number of issue occurrences against specified thresholds. If exceed, terminate oobeeA11y instance.
   });
 });
 
-Cypress.Commands.add("terminateOobeeA11y", () => {
-  cy.task("terminateOobeeA11y");
+Cypress.Commands.add('terminateOobeeA11y', () => {
+  cy.task('terminateOobeeA11y');
 });
+
+const handleViolation = (scanResults = {}, threshold = {}) => {
+  const assertIfConfigured = key => {
+    if (threshold && typeof threshold[key] === 'number') {
+      const actual = Number(scanResults[key] ?? 0);
+      const limit = Number(threshold[key]);
+      expect(
+        actual,
+        `The value of '${key}' (${actual}) should be less than or equal to the threshold (${limit}).`,
+      ).to.be.at.most(limit);
+    }
+  };
+  assertIfConfigured('mustFix');
+  assertIfConfigured('goodToFix');
+};
+
+const takeScreenshotForHTMLElements = (screenshotPath, selector) => {
+  try {
+    cy.get(selector)
+      .if()
+      .then(el => {
+        cy.wrap(el).first().invoke('css', 'border', '3px solid red'); // Highlight element with red border
+        cy.wrap(el).first().parent();
+        cy.wrap(el).first().screenshot(screenshotPath, {
+          overwrite: true,
+          capture: 'viewport',
+        });
+        cy.wrap(el).first().invoke('css', 'border', 'none'); // Remove highlight after screenshot
+      });
+  } catch (e) {
+    cy.log('Error taking screenshot for element', selector, e);
+  }
+};
diff --git a/examples/oobee-cypress-integration-js/package.json b/examples/oobee-cypress-integration-js/package.json
index d57057d1..5a7a1b34 100644
--- a/examples/oobee-cypress-integration-js/package.json
+++ b/examples/oobee-cypress-integration-js/package.json
@@ -7,7 +7,10 @@
     "test": "cypress run"
   },
   "devDependencies": {
+    "@govtechsg/oobee": "^0.10.69",
     "cypress": "^13.0.0",
-    "@govtechsg/oobee": "^0.10.69"
+    "cypress-if": "^1.13.2",
+    "fs-extra": "^11.3.2",
+    "glob": "^11.0.3"
   }
 }