diff --git a/src/app/components/app.test.tsx b/src/app/components/app.test.tsx
index bd3c072e..cad41134 100644
--- a/src/app/components/app.test.tsx
+++ b/src/app/components/app.test.tsx
@@ -5,7 +5,10 @@ import '@testing-library/jest-dom';
 import App from './app';
 import LeftNav from './left-nav';
 import { combinedRoutes } from '../routes';
-import { ExternalLink } from '../../shared';
+import { ExternalLink, LinkToId } from '../../shared';
+import { ApiExample, IApiExample } from '../../shared/api-example';
+import { CodeTab, ICodeTab } from '../../shared/code-tab';
+import NotFound from './notFound/not-found';
 
 describe('App tests', () => {
   afterAll(() => {
@@ -145,4 +148,585 @@ describe('App tests', () => {
       );
     });
   });
+
+  describe('LinkToId Component', () => {
+
+    beforeEach(() => {
+      // Mock window.scrollBy since it's not implemented in jsdom
+      window.scrollBy = jest.fn();
+      // Mock scrollIntoView
+      Element.prototype.scrollIntoView = jest.fn();
+    });
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should render a link with correct href when to prop does not include hash', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <LinkToId to="section1" text="Go to Section 1" />
+        </MemoryRouter>
+      );
+      
+      const link = getByRole('link', { name: 'Go to Section 1' });
+      expect(link).toBeInTheDocument();
+      expect(link).toHaveAttribute('href', '/section1#section1');
+    });
+
+    it('should render a link with correct href when to prop includes hash', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <LinkToId to="page#section2" text="Go to Section 2" />
+        </MemoryRouter>
+      );
+      
+      const link = getByRole('link', { name: 'Go to Section 2' });
+      expect(link).toBeInTheDocument();
+      expect(link).toHaveAttribute('href', '/page#section2');
+    });
+
+    it('should apply custom attributes when attrs prop is provided', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <LinkToId 
+            to="section3" 
+            text="Custom Link"
+          />
+        </MemoryRouter>
+      );
+      
+      const link = getByRole('link', { name: 'Custom Link' });
+      expect(link).toBeInTheDocument();
+    });
+
+    it('should use custom offset when provided', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <LinkToId to="section4" text="Custom Offset Link" offset="50" />
+        </MemoryRouter>
+      );
+      
+      const link = getByRole('link', { name: 'Custom Offset Link' });
+      expect(link).toBeInTheDocument();
+      
+      // Simulate clicking the link to test scroll behavior
+      fireEvent.click(link);
+      
+      // The component should call scrollIntoView and then scrollBy with the custom offset
+      setTimeout(() => {
+        expect(window.scrollBy).toHaveBeenCalledWith({ top: -50, behavior: 'smooth' });
+      }, 0);
+    });
+
+    it('should use default offset of 1 when offset is not provided', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <LinkToId to="section5" text="Default Offset Link" />
+        </MemoryRouter>
+      );
+      
+      const link = getByRole('link', { name: 'Default Offset Link' });
+      expect(link).toBeInTheDocument();
+      
+      // Simulate clicking the link to test scroll behavior
+      fireEvent.click(link);
+      
+      // The component should call scrollIntoView and then scrollBy with default offset
+      setTimeout(() => {
+        expect(window.scrollBy).toHaveBeenCalledWith({ top: -1, behavior: 'smooth' });
+      }, 0);
+    });
+  });
+
+  describe('ApiExample Component', () => {
+
+    it('should render basic API example with verb and URL', () => {
+      const apiData: IApiExample = {
+        verb: 'GET',
+        url: '/api/submissions'
+      };
+
+      const { getByText } = render(<ApiExample data={apiData} />);
+      
+      expect(getByText('GET')).toBeInTheDocument();
+      expect(getByText('/api/submissions')).toBeInTheDocument();
+    });
+
+    it('should render API example with table rows', () => {
+      const apiData: IApiExample = {
+        verb: 'POST',
+        url: '/api/submissions',
+        rows: [
+          {
+            row: ['Parameter', 'Type', 'Description'],
+            classes: ['header-class', 'type-class', 'desc-class']
+          },
+          {
+            row: ['submissionId', 'string', 'Unique identifier for submission']
+          }
+        ]
+      };
+
+      const { getByText, getByRole } = render(<ApiExample data={apiData} />);
+      
+      expect(getByText('POST')).toBeInTheDocument();
+      expect(getByText('/api/submissions')).toBeInTheDocument();
+      expect(getByRole('table')).toBeInTheDocument();
+      expect(getByText('Parameter')).toBeInTheDocument();
+      expect(getByText('Type')).toBeInTheDocument();
+      expect(getByText('Description')).toBeInTheDocument();
+      expect(getByText('submissionId')).toBeInTheDocument();
+      expect(getByText('string')).toBeInTheDocument();
+      expect(getByText('Unique identifier for submission')).toBeInTheDocument();
+    });
+
+    it('should apply CSS classes to table cells when provided', () => {
+      const apiData: IApiExample = {
+        verb: 'PUT',
+        url: '/api/submissions/123',
+        rows: [
+          {
+            row: ['Field', 'Value'],
+            classes: ['field-class', 'value-class']
+          }
+        ]
+      };
+
+      const { container } = render(<ApiExample data={apiData} />);
+      
+      const cells = container.querySelectorAll('td');
+      expect(cells[0]).toHaveClass('field-class');
+      expect(cells[1]).toHaveClass('value-class');
+    });
+
+    it('should render HTML content using dangerouslySetInnerHTML when HTML is detected', () => {
+      const apiData: IApiExample = {
+        verb: 'DELETE',
+        url: '/api/submissions/456',
+        rows: [
+          {
+            row: ['Status', '<strong>Success</strong>']
+          }
+        ]
+      };
+
+      const { getByText, container } = render(<ApiExample data={apiData} />);
+      
+      expect(getByText('Status')).toBeInTheDocument();
+      // Check that the HTML was rendered as actual HTML, not as text
+      const strongElement = container.querySelector('strong');
+      expect(strongElement).toBeInTheDocument();
+      expect(strongElement).toHaveTextContent('Success');
+    });
+
+    it('should render plain text when no HTML is detected', () => {
+      const apiData: IApiExample = {
+        verb: 'PATCH',
+        url: '/api/submissions/789',
+        rows: [
+          {
+            row: ['Message', 'Plain text message']
+          }
+        ]
+      };
+
+      const { getByText, container } = render(<ApiExample data={apiData} />);
+      
+      expect(getByText('Message')).toBeInTheDocument();
+      expect(getByText('Plain text message')).toBeInTheDocument();
+      // Ensure no HTML tags were created
+      expect(container.querySelector('strong')).not.toBeInTheDocument();
+    });
+
+    it('should not render table when rows are not provided', () => {
+      const apiData: IApiExample = {
+        verb: 'OPTIONS',
+        url: '/api/health'
+      };
+
+      const { queryByRole } = render(<ApiExample data={apiData} />);
+      
+      expect(queryByRole('table')).not.toBeInTheDocument();
+    });
+
+    it('should render empty table when rows array is empty', () => {
+      const apiData: IApiExample = {
+        verb: 'HEAD',
+        url: '/api/status',
+        rows: []
+      };
+
+      const { getByRole, container } = render(<ApiExample data={apiData} />);
+      
+      expect(getByRole('table')).toBeInTheDocument();
+      expect(container.querySelectorAll('tr')).toHaveLength(0);
+    });
+
+    it('should handle mixed HTML and plain text in the same row', () => {
+      const apiData: IApiExample = {
+        verb: 'GET',
+        url: '/api/mixed',
+        rows: [
+          {
+            row: ['Plain text', '<em>Emphasized text</em>', 'More plain text']
+          }
+        ]
+      };
+
+      const { getByText, container } = render(<ApiExample data={apiData} />);
+      
+      expect(getByText('Plain text')).toBeInTheDocument();
+      expect(getByText('More plain text')).toBeInTheDocument();
+      
+      const emElement = container.querySelector('em');
+      expect(emElement).toBeInTheDocument();
+      expect(emElement).toHaveTextContent('Emphasized text');
+    });
+
+    it('should handle multiple rows with different class configurations', () => {
+      const apiData: IApiExample = {
+        verb: 'POST',
+        url: '/api/complex',
+        rows: [
+          {
+            row: ['Header 1', 'Header 2'],
+            classes: ['header-1', 'header-2']
+          },
+          {
+            row: ['Data 1', 'Data 2']
+            // No classes for this row
+          },
+          {
+            row: ['Footer 1', 'Footer 2'],
+            classes: ['footer-1'] // Only one class for two cells
+          }
+        ]
+      };
+
+      const { container } = render(<ApiExample data={apiData} />);
+      
+      const rows = container.querySelectorAll('tr');
+      expect(rows).toHaveLength(3);
+      
+      // First row with classes
+      const firstRowCells = rows[0].querySelectorAll('td');
+      expect(firstRowCells[0]).toHaveClass('header-1');
+      expect(firstRowCells[1]).toHaveClass('header-2');
+      
+      // Second row without classes
+      const secondRowCells = rows[1].querySelectorAll('td');
+      expect(secondRowCells[0]).not.toHaveClass();
+      expect(secondRowCells[1]).not.toHaveClass();
+      
+      // Third row with partial classes
+      const thirdRowCells = rows[2].querySelectorAll('td');
+      expect(thirdRowCells[0]).toHaveClass('footer-1');
+      expect(thirdRowCells[1]).not.toHaveClass();
+    });
+
+    it('should render with proper structure and IDs', () => {
+      const apiData: IApiExample = {
+        verb: 'GET',
+        url: '/api/test'
+      };
+
+      const { container } = render(<ApiExample data={apiData} />);
+      
+      const apiExampleDiv = container.querySelector('#api-example');
+      expect(apiExampleDiv).toBeInTheDocument();
+      
+      const verbSpan = container.querySelector('.verb');
+      const urlSpan = container.querySelector('.url');
+      
+      expect(verbSpan).toBeInTheDocument();
+      expect(urlSpan).toBeInTheDocument();
+      
+      const codeElements = container.querySelectorAll('code');
+      expect(codeElements).toHaveLength(2);
+      expect(codeElements[0]).toHaveTextContent('GET');
+      expect(codeElements[1]).toHaveTextContent('/api/test');
+    });
+  });
+
+  describe('CodeTab Component', () => {
+
+    it('should render code tabs with default first tab selected', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'JavaScript',
+          code: 'console.log("Hello World");'
+        },
+        {
+          tab: 'Python',
+          code: 'print("Hello World")'
+        }
+      ];
+
+      const { getByText, getByRole } = render(<CodeTab data={codeData} />);
+      
+      expect(getByText('JavaScript')).toBeInTheDocument();
+      expect(getByText('Python')).toBeInTheDocument();
+      
+      // First tab should be selected by default
+      const jsButton = getByRole('button', { name: 'JavaScript' });
+      const pyButton = getByRole('button', { name: 'Python' });
+      
+      expect(jsButton).toHaveClass('selected');
+      expect(jsButton).toHaveClass('tab-button');
+      expect(pyButton).toHaveClass('tab-button');
+      expect(pyButton).not.toHaveClass('selected');
+    });
+
+    it('should switch tabs when tab buttons are clicked', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'JavaScript',
+          code: 'console.log("Hello World");'
+        },
+        {
+          tab: 'Python',
+          code: 'print("Hello World")'
+        },
+        {
+          tab: 'Java',
+          code: 'System.out.println("Hello World");'
+        }
+      ];
+
+      const { getByRole } = render(<CodeTab data={codeData} />);
+      
+      const jsButton = getByRole('button', { name: 'JavaScript' });
+      const pyButton = getByRole('button', { name: 'Python' });
+      const javaButton = getByRole('button', { name: 'Java' });
+      
+      // Initially JavaScript should be selected
+      expect(jsButton).toHaveClass('selected');
+      expect(pyButton).not.toHaveClass('selected');
+      expect(javaButton).not.toHaveClass('selected');
+      
+      // Click Python tab
+      fireEvent.click(pyButton);
+      expect(jsButton).not.toHaveClass('selected');
+      expect(pyButton).toHaveClass('selected');
+      expect(javaButton).not.toHaveClass('selected');
+      
+      // Click Java tab
+      fireEvent.click(javaButton);
+      expect(jsButton).not.toHaveClass('selected');
+      expect(pyButton).not.toHaveClass('selected');
+      expect(javaButton).toHaveClass('selected');
+    });
+
+    it('should display response section when response is provided', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'Request',
+          code: 'GET /api/data',
+          response: '200 OK'
+        },
+        {
+          tab: 'Response',
+          code: '{"status": "success", "data": []}'
+        }
+      ];
+
+      const { getByText, queryByText, getByRole } = render(<CodeTab data={codeData} />);
+      
+      // Initially should show Request tab with response
+      expect(getByText('Request code:')).toBeInTheDocument();
+      expect(getByText('200 OK')).toBeInTheDocument();
+      expect(getByText('Request body:')).toBeInTheDocument();
+      
+      // Switch to Response tab (no response field)
+      fireEvent.click(getByRole('button', { name: 'Response' }));
+      expect(queryByText('Response code:')).not.toBeInTheDocument();
+      expect(getByText('Response body:')).toBeInTheDocument();
+    });
+
+    it('should render HTML content using dangerouslySetInnerHTML when HTML is detected', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'HTML',
+          code: '<div class="example"><strong>Bold text</strong></div>'
+        }
+      ];
+
+      const { container, getByText } = render(<CodeTab data={codeData} />);
+      
+      expect(getByText('HTML body:')).toBeInTheDocument();
+      
+      // Check that the HTML was rendered as actual HTML elements
+      const strongElement = container.querySelector('strong');
+      expect(strongElement).toBeInTheDocument();
+      expect(strongElement).toHaveTextContent('Bold text');
+      
+      const divElement = container.querySelector('div.example');
+      expect(divElement).toBeInTheDocument();
+    });
+
+    it('should handle single tab data', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'Only Tab',
+          code: 'const single = "only option";',
+          response: 'Single response'
+        }
+      ];
+
+      const { getByText, getByRole } = render(<CodeTab data={codeData} />);
+      
+      const button = getByRole('button', { name: 'Only Tab' });
+      expect(button).toHaveClass('selected');
+      expect(button).toHaveClass('tab-button');
+      
+      expect(getByText('Only Tab code:')).toBeInTheDocument();
+      expect(getByText('Single response')).toBeInTheDocument();
+      expect(getByText('Only Tab body:')).toBeInTheDocument();
+    });
+
+    it('should handle mixed HTML and non-HTML tabs', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'Plain Code',
+          code: 'function hello() { return "world"; }'
+        },
+        {
+          tab: 'HTML Code',
+          code: '<span>Hello <em>World</em></span>'
+        }
+      ];
+
+      const { container, getByRole } = render(<CodeTab data={codeData} />);
+      
+      // Initially on Plain Code tab - should use CopyBlock
+      const codeElements = container.querySelectorAll('pre');
+      expect(codeElements.length).toBeGreaterThan(0);
+      
+      // Switch to HTML tab - should use dangerouslySetInnerHTML
+      fireEvent.click(getByRole('button', { name: 'HTML Code' }));
+      
+      const spanElement = container.querySelector('span');
+      const emElement = container.querySelector('em');
+      expect(spanElement).toBeInTheDocument();
+      expect(emElement).toBeInTheDocument();
+      expect(emElement).toHaveTextContent('World');
+    });
+
+    it('should maintain proper CSS classes for show/hide states', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'Tab 1',
+          code: 'code1'
+        },
+        {
+          tab: 'Tab 2',
+          code: 'code2'
+        }
+      ];
+
+      const { container, getByRole } = render(<CodeTab data={codeData} />);
+      
+      const codeSections = container.querySelectorAll('.code-section');
+      expect(codeSections).toHaveLength(2);
+      
+      // Initially first tab should be shown
+      expect(codeSections[0]).toHaveClass('show');
+      expect(codeSections[1]).toHaveClass('hide');
+      
+      // Switch to second tab
+      fireEvent.click(getByRole('button', { name: 'Tab 2' }));
+      
+      expect(codeSections[0]).toHaveClass('hide');
+      expect(codeSections[1]).toHaveClass('show');
+    });
+
+    it('should render with proper component structure and ID', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'Test',
+          code: 'test code'
+        }
+      ];
+
+      const { container } = render(<CodeTab data={codeData} />);
+      
+      const codeTabsDiv = container.querySelector('#code-tabs');
+      expect(codeTabsDiv).toBeInTheDocument();
+      
+      const tabButtons = container.querySelectorAll('.tab-button');
+      expect(tabButtons).toHaveLength(1);
+      
+      const codeSections = container.querySelectorAll('.code-section');
+      expect(codeSections).toHaveLength(1);
+    });
+
+    it('should handle empty code gracefully', () => {
+      const codeData: ICodeTab[] = [
+        {
+          tab: 'Empty',
+          code: ''
+        }
+      ];
+
+      const { getByText, getByRole } = render(<CodeTab data={codeData} />);
+      
+      const button = getByRole('button', { name: 'Empty' });
+      expect(button).toBeInTheDocument();
+      expect(button).toHaveClass('selected');
+      
+      expect(getByText('Empty body:')).toBeInTheDocument();
+    });
+  });
+
+  describe('NotFound Component', () => {
+
+    beforeEach(() => {
+      // Mock window.scrollBy since it's not implemented in jsdom
+      window.scrollBy = jest.fn();
+      // Mock scrollIntoView
+      Element.prototype.scrollIntoView = jest.fn();
+    });
+
+    afterEach(() => {
+      jest.clearAllMocks();
+    });
+
+    it('should render the page not found heading', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <NotFound />
+        </MemoryRouter>
+      );
+      
+      const heading = getByRole('heading', { name: 'Page Not Found' });
+      expect(heading).toBeInTheDocument();
+      expect(heading).toHaveClass('ds-text-heading--2xl');
+      expect(heading).toHaveAttribute('id', 'help');
+    });
+
+    it('should render a link back to the homepage', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <NotFound />
+        </MemoryRouter>
+      );
+      
+      const homepageLink = getByRole('link', { name: 'homepage' });
+      expect(homepageLink).toBeInTheDocument();
+      expect(homepageLink).toHaveAttribute('href', '/#/');
+    });
+
+
+    it('should have proper styling on the heading', () => {
+      const { getByRole } = render(
+        <MemoryRouter>
+          <NotFound />
+        </MemoryRouter>
+      );
+      
+      const heading = getByRole('heading', { name: 'Page Not Found' });
+      expect(heading).toHaveStyle('margin-top: 0');
+    });
+  });
 });
diff --git a/src/app/components/guides/advanced-tutorial.tsx b/src/app/components/guides/advanced-tutorial.tsx
index 47299de1..734e536e 100644
--- a/src/app/components/guides/advanced-tutorial.tsx
+++ b/src/app/components/guides/advanced-tutorial.tsx
@@ -1,5 +1,4 @@
-import { CodeTab, LinkToId, ExternalLink, ApiExample } from '../../../shared';
-import { steps, apiExamples } from './data';
+import { LinkToId, ExternalLink } from '../../../shared';
 import envConfig from '../../../envConfig';
 
 import '../../../styles/components/tutorial.scss';
@@ -8,7 +7,7 @@ import { DocPageProps } from '../../../shared/types';
 const AdvancedTutorial: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2024</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}} id='advanced-tutorial'>Tutorial: Add and update data via API</h2>
       <p>
         In the <LinkToId to='/tutorial' text='first tutorial' /> we covered how to create a measurement set and retrieve the score in two different API requests. We're now going to build on the previous tutorial by adding another measure to the measurement set we created in the previous tutorial. All of these examples serve to illustrate how the Submissions API can make it easier to react to and fix issues that arise.
@@ -16,10 +15,11 @@ const AdvancedTutorial: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) =>
 
       <h3 className='tutorial-header-link' id='add-more-measures'>Add more measures to an existing measurement set</h3>
       <p>
-        Here's a <code>PATCH</code> request to add more measures to an existing measurement set. You can pass an <code>Accept</code> header to specify the API version and the desired response format by using our custom mime type, <code>application/vnd.qpp.cms.gov.v1+json</code>. We support JSON by using <code>+json</code>. You can also continue to use a standard <code>application/json</code> header, which will point to the latest version. Check out the response and request below!
+        You can use a <code>PATCH</code> request to add more measures to an existing measurement set. You can pass an <code>Accept</code> header to specify the API version and the desired response format by using our custom mime type, <code>application/vnd.qpp.cms.gov.v1+json</code>. We support JSON by using <code>+json</code>. You can also continue to use a standard <code>application/json</code> header, which will point to the latest version.
+      </p>
+      <p>
+        To see an example request and response, please see the <code>PATCH /measurement-sets/:id</code> section within the <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs`} text='Interactive Docs' />.
       </p>
-      <ApiExample data={apiExamples.measurementSetsId2} />
-      <CodeTab data={steps.advanced2} />
 
       <h3>Next steps</h3>
       <p>
diff --git a/src/app/components/guides/basic-tutorial.tsx b/src/app/components/guides/basic-tutorial.tsx
index 8a5d1c24..3ef2c079 100644
--- a/src/app/components/guides/basic-tutorial.tsx
+++ b/src/app/components/guides/basic-tutorial.tsx
@@ -1,12 +1,11 @@
-import { ExternalLink, CodeTab, ApiExample, LinkToId } from '../../../shared';
+import { ExternalLink, LinkToId } from '../../../shared';
 import envConfig from '../../../envConfig';
-import { steps, apiExamples } from './data';
 import { DocPageProps } from '../../../shared/types';
 
 const BasicTutorial: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2024</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}}>Tutorial: Create and Score Data via API</h2>
       <p>
         The Submissions API is an easy way to manage your performance data with CMS. Performance data is organized into submissions, which can have many measurements. Measurements within a submission are also grouped by category (e.g. quality) and submission method (e.g. registry) and program name (e.g. mips) into measurement sets.
@@ -26,26 +25,22 @@ const BasicTutorial: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
         When submitting, you can pass an <code>Accept</code> header to specify the API version and type of response back by using our custom mime type, <code>application/vnd.qpp.cms.gov.v1+json</code>. We support JSON by using <code>+json</code>. Right now, only version <code>v1</code> is supported. You can also continue to use a standard <code>application/json</code> header, which will point to the latest version.
       </p>
       <p>
-        We'll also need to supply some information to tell CMS how to identify this particular submission, which you can see below. Every submission is unique to the combination of the fields provided. Note that we enforce fake TINs (starting with <code>000</code>) in the Developer Preview Testing Environment to avoid accidentally collecting personally identifiable information.
+        We'll also need to supply some information to tell CMS how to identify this particular submission. Every submission is unique to the combination of the fields provided. Note that we enforce fake TINs (starting with <code>000</code>) in the Developer Preview Testing Environment to avoid accidentally collecting personally identifiable information.
       </p>
       <p>
-        Take a look at the request below, and then click the 'Response' tab to see what the API returns when we submit this request!
+        To see an example request and response, please see the <code>POST /measurement-sets</code> section within the <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs`} text='Interactive Docs' />.
       </p>
-      <ApiExample data={apiExamples.measurementSets} />
-      <CodeTab data={steps.basic1} />
 
       <h3 className='ds-text-heading--xl' id='scoring-a-submission'>Scoring a submission</h3>
       <p>
         With the submission <code>id</code> we were given, we can ask the API to calculate the submission score with a GET request. We don't need to include a request body this time since we're only interested in retrieving the score, and CMS doesn't need any information other than the submission <code>id</code>.
       </p>
-      <ApiExample data={{verb: 'GET', url: '/submissions/:id/score'}} />
-      <CodeTab data={steps.basic2} />
-
       <p>
-        In general, we can think about the Submissions API as a way to have a live conversation with CMS about performance measurements. Rather than waiting months to hear back about missing information or a score, the API gives us feedback that is immediate, specific, and actionable - we can easily make another API request if necessary.
+        To see an example request and response, please see the <code>GET /submissions/:id/score</code> section within the <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs`} text='Interactive Docs' />.
       </p>
+
       <p>
-        What we've shown is an example of working directly with the API - typically these requests are made through a web interface or script, but the requests &amp; responses above illustrate the kind of power and speed the Submissions API and applications built against it can provide.
+        In general, we can think about the Submissions API as a way to have a live conversation with CMS about performance measurements. Rather than waiting months to hear back about missing information or a score, the API gives us feedback that is immediate, specific, and actionable - we can easily make another API request if necessary.
       </p>
       <p>
         <em>Disclaimer:</em> Scoring is subject to change, based on periodic policy updates, eligibility reviews, and technical integration developments.
diff --git a/src/app/components/references/benchmarks.tsx b/src/app/components/references/benchmarks.tsx
index 371e804b..d1695908 100644
--- a/src/app/components/references/benchmarks.tsx
+++ b/src/app/components/references/benchmarks.tsx
@@ -7,17 +7,17 @@ import { DocPageProps } from '../../../shared/types';
 const Benchmarks: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2024</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}} id='current-benchmarks'>Benchmarks</h2>
       <p className='ds-text-body--lg'>
-        Benchmarks serve as the reference points for measurements and are used to score submissions. Each benchmark is unique based upon its combination of measureId, submissionMethod, and performanceYear, and each has a list of 9 data points.
+        Benchmarks serve as the reference points for measurements and are used to score submissions. Each benchmark is unique based upon its combination of measureId, submissionMethod, and performanceYear, and each has a list of 11 data points.
       </p>
       <p>
-        Please see the <ExternalLink href={`${envConfig.amazoneawsUrl}/uploads/2671/2024BenchmarksUserGuide.pdf`}
-        text='2024 Quality Benchmarks User Guide with Scoring Examples' /> for more information on MIPS Quality Benchmarks.
+        Please see the <ExternalLink href={`${envConfig.amazoneawsUrl}/uploads/3162/2025-Quality-Benchmarks-User-Guide.pdf`}
+        text='2025 Quality Benchmarks User Guide with Scoring Examples' /> for more information on MIPS Quality Benchmarks.
       </p>
       <p>
-        You can view the benchmarks for a Performance Year using the publicly accessible <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs/#/Public%20Endpoints/listBenchmarks`} text='benchmarks endpoint' />.
+        You can view the benchmarks for a Performance Year using the publicly accessible <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs/#/Public%20Endpoints/BenchmarksController_getBenchmarks`} text='benchmarks endpoint' />.
       </p>
       <br />
       <CodeTab data={benchmarksTabs.fields} />
diff --git a/src/app/components/references/data.ts b/src/app/components/references/data.ts
index 83f86f51..ff8f0e2e 100644
--- a/src/app/components/references/data.ts
+++ b/src/app/components/references/data.ts
@@ -19,10 +19,6 @@ interface IScoringData {
   [k: string]: ICodeTab[];
 }
 
-export const measurementSetPracticeDetails = {
-  'Practice Details': 'practice-details',
-};
-
 export const measurementsTitleAndId = {
   'Boolean': 'boolean-measurements',
   'Proportion': 'proportion-measurements',
@@ -329,18 +325,13 @@ export const measurementSetsFields: IFields = {
     { name: 'updatedAt', value: 'datetime', description: 'The modification time of the measurement set in <a href="https://www.ietf.org/rfc/rfc3339.txt" rel="noopener noreferrer" target="_blank">RFC 3339</a> format.', notes: ' ' },
     { name: 'submissionId', value: 'string', description: 'The id of the submission in which the measurement set belongs.', notes: ' ' },
     { name: 'category', value: 'string', description: 'The category of the measurement set. Acceptable values are: <li><b>"quality"</b></li> <li><b>"pi"</b></li> <li><b>"ia"</b></li>', notes: 'writable, required' },
-    { name: 'cehrtId', value: 'string', description: 'The CMS EHR Certification Identification Number is generated by the CHPL. This is only applicable to Promoting Interoperability measurement sets.', notes: 'writable, required' },
+    { name: 'cehrtId', value: 'string', description: 'The CMS EHR Certification Identification Number is generated by the CHPL. This is applicable to Promoting Interoperability and eCQM Quality measurement sets. CEHRT ID must be in the format 2025CXXXXXXXXXX or XX15CXXXXXXXXXX.', notes: 'writable, required' },
     { name: 'submissionMethod', value: 'string', description: 'The method by which the measurement set data was submitted. Acceptable values are: <ul><li>Quality Category:<ul><li><b>"registry"</b> for MIPS CQMs reporting</li><li><b>"electronicHealthRecord"</b> for eCQM Reporting</li></ul></li><li>Promoting Interoperability and Improvement Activities:<ul><li><b>"registry"</b> for non QRDA format</li><li><b>"electronicHealthRecord"</b> for QRDA</li></ul></li></ul>', notes: 'writable, required' },
-    { name: 'programName', value: 'string', description: 'The quality payment program under which the measurementSet should be scored.  Acceptable values are: <li><b>"mips"</b> for Traditional MIPS Reporting<li><b>"app1"</b> for the APM Performance Pathway</li><li><b>"MVP ID"</b> more information on the IDs can be found at the <a href="https://qpp.cms.gov/mips/mips-value-pathways" rel="noopener noreferrer" target="_blank">QPP Resource Library</a></li><li><b>"pcf"</b> for PCF Program submissions</li> If not provided, the programName will be recorded as "mips".', notes: 'writable, optional' },
-    { name: 'practiceDetails', value: 'object', description: `This object contains the taxpayerIdentificationNumber and/or nationalProviderIdentifiers of the practice associated with the measurement set. Optional if programName is set to <b>"pcf"</b>. Must be omitted if programName is not set to <b>"pcf"</b>. More details <a href='measurement-sets#practice-details'>below</a>.`, notes: 'writeable, optional'},
+    { name: 'programName', value: 'string', description: 'The quality payment program under which the measurementSet should be scored. Acceptable values are: <li><b>"mips"</b> for Traditional MIPS Reporting</li><li><b>"app1"</b> for the legacy APM Performance Pathway</li><li><b>"appPlus"</b> for the APM Performance Pathway Plus Quality Measure Set</li><li><b>"MVP ID"</b> more information on the IDs can be found at the <a href="https://qpp.cms.gov/mips/mips-value-pathways" rel="noopener noreferrer" target="_blank">QPP Resource Library</a></li> If not provided, the programName will be recorded as "mips".', notes: 'writable, optional' },
     { name: 'performanceStart', value: 'string', description: 'A date in RFC 3339 format with only the date part (for instance, "2013-01-15"). The first date when the measurement data is applicable.', notes: 'writable, required' },
     { name: 'performanceEnd', value: 'string', description: 'A date in RFC 3339 format with only the date part (for instance, "2013-01-15"). The last date when the measurement data is applicable.', notes: 'writable, required' },
     { name: 'measurements', value: 'Array(measurements)', description: 'Measurements associated with the measurement set.', notes: 'writable, optional' },
   ],
-  practiceDetails: [
-    { name: 'taxpayerIdentificationNumber', value: 'string', description: 'The 9-digit identifier of the practice associated with the measurementSet. ', notes: 'writeable, optional'},
-    { name: 'nationalProviderIdentifiers', value: 'string[]', description: 'An array of strings containing the 10-digit identifiers of the practice associated with the measurementSet, separated by commas.', notes: 'writeable, optional'},
-  ],
 };
 
 export const measurementSetsTabs: ITabs = {
@@ -356,19 +347,9 @@ export const measurementSetsTabs: ITabs = {
   "cehrtId": string,
   "submissionMethod": string,
   "programName": string,
-  "practiceDetails": object(<a href='measurement-sets#practice-details'>Practice Details</a>),
   "performanceStart": date,
   "performanceEnd": date,
   "measurements": array(<a href='measurements'>Measurements Resource</a>)
-}`,
-    },
-  ],
-  practiceDetails: [
-    {
-      tab: 'Sample JSON',
-      code: `{
-  "taxpayerIdentificationNumber": string,
-  "nationalProviderIdentifiers": string[]
 }`,
     },
   ],
@@ -428,8 +409,8 @@ export const benchmarksTabs: ITabs = {
     {
       tab: 'Sample JSON',
       code: `{
-  "benchmarkYear": 2021,
-  "performanceYear": 2024,
+  "benchmarkYear": 2023,
+  "performanceYear": 2025,
   "metricType": "singlePerformanceRate",
   "status": "historical",
   "isInverse": true,
diff --git a/src/app/components/references/error-codes.tsx b/src/app/components/references/error-codes.tsx
index 4bee889b..d096dfa8 100644
--- a/src/app/components/references/error-codes.tsx
+++ b/src/app/components/references/error-codes.tsx
@@ -1,13 +1,14 @@
+import envConfig from '../../../envConfig';
 import { ExternalLink } from '../../../shared';
 import { DocPageProps } from '../../../shared/types';
 
 const ErrorCodes: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/31/2022</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}} id='references'>Error Codes</h2>
 
-      <h3 className='ds-text-heading--lg'>The Submissions API Error Codes summary can be found in the <ExternalLink href={`https://cmsgov.github.io/qpp-developer-preview-docs/error-codes`} text='Developer Preview Documentation' /></h3>
+      <h3 className='ds-text-heading--lg'>To review a list of response codes provided by the API, please visit the <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs`} text='Interactive Docs' />.</h3>
     </div>
   );
 };
diff --git a/src/app/components/references/measurement-sets.tsx b/src/app/components/references/measurement-sets.tsx
index 8ace0e76..827f3f5a 100644
--- a/src/app/components/references/measurement-sets.tsx
+++ b/src/app/components/references/measurement-sets.tsx
@@ -1,12 +1,12 @@
 import { ExternalLink, DataModelTable, CodeTab } from '../../../shared';
 import envConfig from '../../../envConfig';
-import { measurementSetsFields, measurementSetsTabs, measurementSetPracticeDetails } from './data';
+import { measurementSetsFields, measurementSetsTabs } from './data';
 import { DocPageProps } from '../../../shared/types';
 
 const MeasurementSets: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 07/06/2023</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}}>Measurement Sets</h2>
       <p className='ds-text-body--lg'>
         The MeasurementSets resource represents performance data for a specified category. Each Submission can have multiple MeasurementSets. Each MeasurementSet in a given Submission is uniquely identified by category, submission method, and programName. MeasurementSets contain Measurements, which can be accessed both via MeasurementSets methods and Measurements methods.
@@ -17,17 +17,6 @@ const MeasurementSets: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) =>
 
       <CodeTab data={measurementSetsTabs.fields} />
       <DataModelTable data={measurementSetsFields.fields} />
-      <h2
-        className='ds-text-heading--2xl'
-        id={measurementSetPracticeDetails['Practice Details']}
-      >
-        Practice Details
-      </h2>
-      <p className='ds-text-body--lg'>
-        The MeasurementSet property practiceDetails is an optional property only available when programName is set to "pcf".
-      </p>
-      <CodeTab data={measurementSetsTabs.practiceDetails} />
-      <DataModelTable data={measurementSetsFields.practiceDetails} />
     </div>
   );
 };
diff --git a/src/app/components/references/references.tsx b/src/app/components/references/references.tsx
index 1a26525e..76615649 100644
--- a/src/app/components/references/references.tsx
+++ b/src/app/components/references/references.tsx
@@ -5,7 +5,7 @@ import { DocPageProps } from '../../../shared/types';
 const References: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 05/12/2021</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}} id='references'>References</h2>
 
       <h3 className='ds-text-heading--xl'>General References</h3>
@@ -50,13 +50,6 @@ const References: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
           Interactive AUTH API Documentation: <ExternalLink href={`${envConfig.qppCmsUrl}/api/auth/docs`} />
         </li>
       </ul>
-
-      <h3 className='ds-text-heading--xl'>CMS Web Interface API</h3>
-      <ul>
-        <li>
-          Interactive Web Interface Documentation: <ExternalLink href={`${envConfig.qppCmsUrl}/api/submissions/web-interface/docs`} />
-        </li>
-      </ul>
     </div>
   );
 };
diff --git a/src/app/components/references/scoring.tsx b/src/app/components/references/scoring.tsx
index f675757b..d28e7ae8 100644
--- a/src/app/components/references/scoring.tsx
+++ b/src/app/components/references/scoring.tsx
@@ -1,5 +1,4 @@
-import { ExternalLink, CodeTab, LinkToId } from '../../../shared';
-import { scoringData } from './data';
+import { ExternalLink, LinkToId } from '../../../shared';
 import envConfig from '../../../envConfig';
 import { DocPageProps } from '../../../shared/types';
 
@@ -39,7 +38,7 @@ const textAndId: ITextAndId = {
 const Scoring: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2024</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}}>Scoring</h2>
       <p className='ds-text-body--lg'>
         The scoring engine is responsible for interpreting submissions and outputting a score. Each category score is utilized to create the QPP score object.
@@ -50,7 +49,7 @@ const Scoring: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
       <h3 className='ds-text-heading--xl'>Developer Preview Testing Environment</h3>
       <p className='ds-text-body--lg'>
         In the Developer Preview Testing Environment you can use the <code>POST .../score-preview</code> endpoint to view the scoring object returned for the data you are proposing to submit.
-        The data is not saved. Try the <code>POST .../submissions/score-preview</code> endpoint <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs/#/Submissions/scoreSubmission`} text='here' />.
+        The data is not saved. Try the <code>POST .../submissions/score-preview</code> endpoint <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs/#/Submissions/SubmissionsController_scorePreview`} text='here' />.
       </p>
       <p className='ds-text-body--lg'>
         Note: You can use the <ExternalLink href={`${envConfig.cmsGithubIo}/qpp-developer-preview-docs/tutorial-special-scoring-scenarios`}text='special scoring scenarios test data'/> to see the score responses for different types of eligibility profiles.
@@ -59,9 +58,8 @@ const Scoring: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
       <p>
         Once submitting quality data during the Submission window you can use the <code>GET .../submissions/&#123;id&#125;/score</code> to view the score for the data after it is submitted.
         This submission data is saved under the submissionId and retrieved to view the score.
-        Try the <code>GET .../submissions/&#123;id&#125;/score</code> endpoint <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs#/Submissions/getSubmissionScore`} text='here' />.
+        Try the <code>GET .../submissions/&#123;id&#125;/score</code> endpoint <ExternalLink href={`${envConfig.qppCmsPreviewUrl}/api/submissions/public/docs/#/Submissions/SubmissionsController_getScore`} text='here' />.
       </p>
-      <br/>
       <h2 className='ds-text-heading--2xl' id={textAndId['Improvement Activities'].id}>Improvement Activities (IA) Scoring</h2>
       <p className='ds-text-body--lg'>
         The only available option for reporting Improvement Activities is boolean, and only Activities completed need to be reported.
@@ -72,37 +70,23 @@ const Scoring: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
         </li>
       </ul>
 
-
-      <h3 className='ds-text-heading--xl' id={textAndId['Improvement Activities'].sub['Improvement Activity Submissions']}>Example IA Submission</h3>
+      <h2 className='ds-text-heading--2xl'>Promoting Interoperability (PI) Scoring</h2>
       <p className='ds-text-body--lg'>
-        The example submission below contains 4 activities. The reported activities contain both High and Medium weighted activities.
-      </p>
-      <CodeTab data={scoringData.submissionJsonExampleStringIa} />
-
-
-      <h3 className='ds-text-heading--xl'>Example Scoring</h3>
-      <p>
-        Use the <code>.../submisisons/score-preview</code> endpoint (above) to see the scoring response.
+        The Promoting Interoperability Category requires all measures associated with the category to either be reported or their corresponding exclusion to be claimed. Additionally, to receive credit for the category, all the criteria below must be fulfilled:
       </p>
+      <ul>
+        <li>Utilization of the required CEHRT and the reporting of the corresponding CMS CEHRT ID in the submission</li>
+      </ul>
 
-
-      <br/>
-      <h2 className='ds-text-heading--2xl'>Promoting Interoperability (PI) Scoring</h2>
       <p className='ds-text-body--lg'>
-        The Promoting Interoperability Category requires all measures associated with the category to either be reported or their corresponding exclusion to be claimed. Additionally, to receive credit for the category, all the criteria below must be fulfilled:
+        For additional information on reporting Promoting Interoperability, visit the Resource Library for your specific program needs.
       </p>
       <ul>
-        <li>Utilization of 2015 CEHRT and the reporting of the corresponding CMS CEHRT ID in the submission</li>
-          <ul>
-            <li>XX15CXXXXXXXXXX</li>
-          </ul>
-        <li>Minimum 180 day performance period</li>
-        <li>Completion of Required Attestation Statements</li>
-        <li>Completion of All Required Measures</li>
-        <li>Bonus Measures</li>
+        <li><ExternalLink href='https://qpp.cms.gov/mips/promoting-interoperability?py=2025' text='Traditional MIPS' /></li>
+        <li><ExternalLink href='https://qpp.cms.gov/mips/explore-mips-value-pathways' text='Explore MVPs' /></li>
+        <li><ExternalLink href='https://qpp.cms.gov/mips/app-promoting-interoperability' text='PI: APP Requirements' /></li>
       </ul>
 
-      <h3 className='ds-text-heading--xl' id={textAndId['Promoting Interoperability'].sub['Promoting Interoperability Submissions']}>Example PI Submission</h3>
       <p className='ds-text-body--lg'>
         The measure types available for submission are outlined below. Each measure in the repo will dictate which type is to be utilized.
       </p>
@@ -114,22 +98,17 @@ const Scoring: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
           <LinkToId to='/measurements#boolean-measurements' text='Boolean' offset='120' />
         </li>
       </ul>
-      <CodeTab data={scoringData.submissionJsonExampleStringAci} />
-
 
-      <h3 className='ds-text-heading--xl'>Example Scoring</h3>
-      <p>
-        Use the <code>.../submisisons/score-preview</code> endpoint (above) to see the scoring response.
-      </p>
-
-
-      <br/>
       <h2 className='ds-text-heading--2xl' id={textAndId.Quality.id}>Quality</h2>
       <p className='ds-text-body--lg'>
-        The Quality category requires 6 measures to receive full credit, one of which must be either an Outcome measure or High Priority. If no Outcome or High Priority measure is submitted, you will only be scored on the top 5 measures and receive a score of 0 for the sixth measure.
+        For additional information on reporting Quality, visit the <ExternalLink href={`${envConfig.qppCmsUrl}/resources/resource-library`} text='Resource Library' /> for your specific program needs.
       </p>
+      <ul>
+        <li><ExternalLink href={`${envConfig.qppCmsUrl}/mips/quality-requirements?py=2025`} text='Traditional MIPS' /></li>
+        <li><ExternalLink href={`${envConfig.qppCmsUrl}/mips/explore-mips-value-pathways`} text='Explore MVPs' /></li>
+        <li><ExternalLink href={`${envConfig.qppCmsUrl}/mips/app-quality-requirements`} text='Quality: APP Requirements' /></li>
+      </ul>
 
-      <h3 className='ds-text-heading--xl' id={textAndId.Quality.sub['Quality Submissions']}>Example Quality Submission</h3>
       <p className='ds-text-body--lg'>
         Submission structure in the Quality category are contingent on the measure being submitted. If there are questions around the data to be submitted in the fields, please refer to the measure specification. The available types related to the measures are outlined below:
       </p>
@@ -144,17 +123,10 @@ const Scoring: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
           <LinkToId to='/measurements#multi-performance-rate-measurements' text='Multi-Performance Rates' offset='120' />
         </li>
       </ul>
-      <p className='ds-text-body--lg'>
-        In the sample below, measure 305 is a multi-strata performance measure, 102 is a single performance measure, ACRAD15 is a non-proportion measure.
-      </p>
-      <CodeTab data={scoringData.submissionJsonExampleStringQuality} />
-
 
-      <h3 className='ds-text-heading--xl'>Example Scoring</h3>
-      <p>
-        Use the <code>.../submisisons/score-preview</code> endpoint (above) to see the scoring response.
+      <p className='ds-text-body--lg'>
+        eCQMs require the utilization of CEHRT and the reporting of the corresponding CMS CEHRT ID in the submission.
       </p>
-
     </div>
   );
 };
diff --git a/src/app/components/resources-and-support/frequently-asked-questions.tsx b/src/app/components/resources-and-support/frequently-asked-questions.tsx
index eaced256..be8fcbf8 100644
--- a/src/app/components/resources-and-support/frequently-asked-questions.tsx
+++ b/src/app/components/resources-and-support/frequently-asked-questions.tsx
@@ -8,12 +8,9 @@ const tableData = {
       <li>
         Submissions UI: EHRs can submit via the Submissions UI by logging into the QPP site <a href='https://qpp.cms.gov' target='_blank' rel='noopener noreferrer'>qpp.cms.gov</a>. They will have to be connected as a Staff user for each of the Individuals and Groups they need to submit quality data for. Submissions for each individual or group could be uploaded as an excel file for efficiency.
       </li>
-      <li>
-        Burden Reduction: EHRs may apply for Burden Reduction which allows them to obtain a registry token to use to submit via the Submissions API.
-      </li>
     </ul>
   `,
-  'What is the performance threshold for the Submissions API?': '25 rps avg threshold, 40 rps burst threshold.',
+  'What is the performance response threshold for the Submissions API?': '25 rps avg threshold, 40 rps burst threshold.',
 };
 
 const tableData1 = {
@@ -27,13 +24,12 @@ const tableData1 = {
       </li>
     </ul>
   `,
-  'How do I report SubGroups?': `SubGroups are available for testing in DevPre as of 9/29/23.  See the tutorial here <a href='https://cmsgov.github.io/qpp-developer-preview-docs/tutorial-subgroup-submissions' target='_blank' rel='noopener noreferrer'>QPP Developer Preview Documentation</a>`,
 };
 
 const FrequentlyAskedQuestions: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2024</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}}>Frequently Asked Questions</h2>
 
       <h3 className='ds-text-heading--xl'>General and Developer Preview</h3>
@@ -60,7 +56,7 @@ const FrequentlyAskedQuestions: React.FC<DocPageProps> = ({dataTestId}: DocPageP
           )}
         </tbody>
       </table>
-      <h3 className='ds-text-heading--xl'>PY24 Questions and Known Issues</h3>
+      <h3 className='ds-text-heading--xl'>PY25 Questions and Known Issues</h3>
       <table className='ds-c-table ds-u-font-size--sm faq-table'>
         <thead>
           <tr>
diff --git a/src/app/components/topics/announcements.tsx b/src/app/components/topics/announcements.tsx
index f280af79..46c22298 100644
--- a/src/app/components/topics/announcements.tsx
+++ b/src/app/components/topics/announcements.tsx
@@ -5,7 +5,7 @@ import { DocPageProps } from '../../../shared/types';
 const Announcements: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2024</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}}>Announcements</h2>
 
       <h3 className='ds-text-heading--xl'>General</h3>
@@ -16,10 +16,10 @@ const Announcements: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
       <h3 className='ds-text-heading--xl'>Submission API</h3>
       <ul>
         <li>
-          Updates for traditional MIPS submissions and scoring for PY 2024 are now available.
+          Updates for traditional MIPS submissions and scoring for PY 2025 are now available.
           </li>
         <li>
-          For APM participants only, APP submissions and scoring rules for PY 2024 are now available.
+          For APM participants only, APP submissions and scoring rules (app1 and appPlus programs) for PY 2025 are now available.
           </li>
         <li>
           The Submissions API has received infastructure updates with minor changes to end users.
@@ -32,10 +32,10 @@ const Announcements: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) => {
       <h3 className='ds-text-heading--xl'>Measures Repository</h3>
       <ul>
         <li>
-          2024 Measures are published and available here: <ExternalLink href='https://github.com/CMSgov/qpp-measures-data/tree/develop/measures' />
+          2025 Measures are published and available here: <ExternalLink href='https://github.com/CMSgov/qpp-measures-data/tree/master/measures' />
         </li>
         <li>
-          2024 MVP Measures are published and available here: <ExternalLink href='https://github.com/CMSgov/qpp-measures-data/tree/develop/mvp' />
+          2025 MVP Measures are published and available here: <ExternalLink href='https://github.com/CMSgov/qpp-measures-data/tree/master/mvp' />
         </li>
       </ul>
     </div>
diff --git a/src/app/components/topics/change-log.tsx b/src/app/components/topics/change-log.tsx
index 69749fe8..9686dd51 100644
--- a/src/app/components/topics/change-log.tsx
+++ b/src/app/components/topics/change-log.tsx
@@ -2,6 +2,23 @@ import envConfig from '../../../envConfig';
 import { DocPageProps } from '../../../shared/types';
 
 const submissionChangesTable = [
+  ['08/28/2025', `Updates to Developer Documentation for Performance Year 2025 Description`, `
+  <ul>
+    <li>Simplified Scenarios for MVP Reporting in Developer Preview. See the <a href='${envConfig.cmsGithubIo}/qpp-developer-preview-docs/tutorial-special-scoring-scenarios' target='_blank' rel='noopener noreferrer'>Special Scoring Scenarios</a>.</li>
+    <li>There is now 1 TIN and 1 Subgroup that will work when testing any MVP that is valid for the performance year.
+      <ul>
+        <li>Negative use tests can be completed using any other TIN/Subgroup.</li>
+      </ul>
+    </li>
+    <li>Added support for APP Plus Reporting. See the <a href='${envConfig.cmsGithubIo}/qpp-developer-preview-docs/tutorial-special-scoring-scenarios' target='_blank' rel='noopener noreferrer'>Special Scoring Scenarios</a>.</li>
+    <li>Allowed CEHRT ID format change for Promoting Interoperability. See <a href='${envConfig.cmsGithubIo}/qpp-submissions-docs/measurement-sets' target='_blank' rel='noopener noreferrer'>Measurement Sets</a>.</li>
+    <li>Quality eCQM reporting now requires the inclusion of a CEHRT ID.</li>
+    <li>Removal of IA weights.</li>
+    <li>Removal of <code>measureSet</code> property from <code>/measurement-sets</code> endpoints.</li>
+    <li>Removal of <strong>pcf</strong> program.</li>
+    <li>CMS Web Interface has been sunset across QPP.</li>
+  </ul>
+  `],
   ['08/28/2024', `Updates to Developer Documentation for Performance Year 2024`, `
   <ul>
     <li>Added new Scenarios for MVP Reporting. See the <a href='${envConfig.cmsGithubIo}/qpp-developer-preview-docs/tutorial-special-scoring-scenarios' target='_blank' rel='noopener noreferrer'>Special Scoring Scenarios</a>.</li>
@@ -186,6 +203,8 @@ const submissionChangesTable = [
     </ul>`],
 ];
 const measuresChangeTable = [
+  ['3/18/25', `<code>allowedRegistrationTypes</code> has been added to all measures.`, `For all measures, <code>allowedRegistrationTypes</code> has been added to indicate which entity types can submit the measure. Note, as this is intended for use with MVP registration workflows, virtual groups are not listed. Virtual Groups can still report to measures outside of MVPs.`],
+  ['11/8/24', `<code>isSevenPointCapRemoved</code> and <code>sevenPointCapRemoved</code> have been added to all quality measures.`, `For category: "quality", <code>isSevenPointCapRemoved</code> and <code>sevenPointCapRemoved</code> is added. These fields will indicate when a measure will no longer have the 7-point cap applied but rather scored according to the new topped out measure benchmarks.`],
   ['08/01/24', `<code>companionMeasureId</code> is added to all quality Measures.`, `For <code>category: "quality"</code>, <code>companionMeasureId</code>  is added to list the corresponding CQM or Medicare CQM measure id.`],
   ['8/15/21', `<code>allowedPrograms</code> is added to all quality Measures.`, `For <code>category: "quality"</code>, <code>allowedPrograms</code> is added to list the programs to which the measure <i>can</i> be submitted.`],
   ['8/15/21', `<code>requiredForPrograms</code> is added to all quality Measures.`, `For <code>category: "quality"</code>, <code>requiredForPrograms</code> is added to list the programs to which the measure <i>must</i> be submitted.`],
@@ -223,7 +242,7 @@ const buildTableBody = (data: string[][]) =>
 const ChangeLog: React.FC<DocPageProps> = ({dataTestId}: DocPageProps) =>{
   return (
     <div data-testid={dataTestId}>
-      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2024</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
+      <p className='qpp-docs-page-updated'>Last Updated: 08/28/2025</p> {/* IMPORTANT: update this Last-Updated value if you have made any changes to this page's content. */}
       <h2 className='ds-text-heading--2xl' style={{marginTop: 0}} id='change-log'>Change Log</h2>
       <p className='ds-text-body--md'>
         The Change log is updated with each significant change to the API with the details that you need to be aware of.