diff --git a/app/views/record-vaccinations/covid-19/no-gp-surgery.html b/app/views/record-vaccinations/covid-19/no-gp-surgery.html
new file mode 100644
index 00000000..bf61ef55
--- /dev/null
+++ b/app/views/record-vaccinations/covid-19/no-gp-surgery.html
@@ -0,0 +1,48 @@
+
+{% extends 'layout.html' %}
+
+{% set pageName = "Patient has no GP surgery" %}
+
+{% set currentSection = "vaccinate" %}
+
+{% block beforeContent %}
+  {{ backLink({ href: "/record-vaccinations/patient-history" }) }}
+{% endblock %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+      {% if data.firstName and data.lastName %}
+        {% set displayName = data.firstName ~ ' ' ~ data.lastName %}
+      {% else %}
+        {% set displayName = 'Patient Name' %}
+      {% endif %}
+
+      {% if data.locationType %}
+        {% set locationType = data.locationType %}
+      {% else %}
+        {% set locationType = '[Location Type]' %}
+      {% endif %}
+
+      {% set panelHtml %}
+        <p>This patient does not have a registered GP surgery.</p>
+        <p>Your organisation may not be paid for this vaccination.</p>
+
+        {{ button({
+          "text": "Continue anyway",
+          "href": "/record-vaccinations/consent",
+          "classes": "nhsuk-button--reverse"
+        }) }}
+      {% endset %}
+
+      {{ panel({
+        titleText: displayName + " has no GP surgery",
+        html: panelHtml,
+        classes: "nhsuk-panel--interruption"
+      }) }}
+
+    </div>
+  </div>
+{% endblock %}
+
diff --git a/app/views/record-vaccinations/covid-19/not-in-pcn-warning.html b/app/views/record-vaccinations/covid-19/not-in-pcn-warning.html
new file mode 100644
index 00000000..d87c00a9
--- /dev/null
+++ b/app/views/record-vaccinations/covid-19/not-in-pcn-warning.html
@@ -0,0 +1,49 @@
+
+{% extends 'layout.html' %}
+
+{% set pageName = "Patient not in PCN" %}
+
+{% set currentSection = "vaccinate" %}
+
+{% block beforeContent %}
+  {{ backLink({ href: "/record-vaccinations/patient-history" }) }}
+{% endblock %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+
+      {% if data.firstName and data.lastName %}
+        {% set displayName = data.firstName ~ ' ' ~ data.lastName %}
+      {% else %}
+        {% set displayName = 'Patient Name' %}
+      {% endif %}
+
+      {% if data.locationType %}
+        {% set locationType = data.locationType %}
+      {% else %}
+        {% set locationType = '[Location Type]' %}
+      {% endif %}
+
+      {% set panelHtml %}
+        <p>This patient's GP surgery is not part of your PCN.</p>
+        <p>Your organisation may not be paid for this vaccination.</p>
+
+        {{ button({
+          "text": "Continue anyway",
+          "href": "/record-vaccinations/consent",
+          "classes": "nhsuk-button--reverse"
+        }) }}
+      {% endset %}
+
+      {{ panel({
+        titleText: displayName + " is not in your PCN",
+        html: panelHtml,
+        classes: "nhsuk-panel--interruption"
+      }) }}
+
+    </div>
+  </div>
+{% endblock %}
+
diff --git a/app/views/record-vaccinations/patient-history-no-gp.html b/app/views/record-vaccinations/patient-history-no-gp.html
new file mode 100644
index 00000000..62c4c550
--- /dev/null
+++ b/app/views/record-vaccinations/patient-history-no-gp.html
@@ -0,0 +1,265 @@
+{% extends 'layout.html' %}
+
+{% set pageName = "Check the patient's details" %}
+
+{% set currentSection = "vaccinate" %}
+
+{% set dateOfBirthHtml %}
+  {% if data.dateOfBirth.day %}
+    {{ (data.dateOfBirth | isoDateFromDateInput | govukDate) }}
+    <div class="nhsuk-u-secondary-text-colour">{{ data.dateOfBirth | isoDateFromDateInput | age }} old</div>
+  {% else %}
+    {{ (data.dateOfBirth | govukDate) }}
+    <div class="nhsuk-u-secondary-text-colour">{{ data.dateOfBirth | age }} old</div>
+  {% endif %}
+{% endset %}
+
+{% if data.repeatVaccination === "yes" %}
+  {% set nextPage = "/record-vaccinations/consent" %}
+{% elseif data.repeatPatient === "yes" %}
+  {% set nextPage = "/record-vaccinations/vaccine" %}
+{% else %}
+  {% set nextPage = "/record-vaccinations/vaccination-date" %}
+{% endif %}
+
+{% if data.from == "appointments" %}
+  {% set previousPage = "/appointments" %}
+{% elseif data.repeatVaccination === "yes" %}
+  {% set previousPage = "/record-vaccinations/patient" %}
+{% elseif data.repeatPatient === "yes" %}
+  {% set previousPage = "/record-vaccinations/done" %}
+{% else %}
+  {% set previousPage = "/record-vaccinations" %}
+{% endif %}
+
+{% block beforeContent %}
+  {{ backLink({ href: previousPage }) }}
+{% endblock %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+
+      <h1 class="nhsuk-heading-l">Check {{ data.firstName }} {{ data.lastName }}’s details and vaccination history</h1>
+
+      {{ warningCallout({
+        heading: "No GP surgery",
+        text: "This patient does not have a registered GP surgery."
+      }) }}
+
+      {{ summaryList({
+        rows: [
+          {
+            key: {
+              text: "Name"
+            },
+            value: {
+              text: (data.firstName + " " + data.lastName)
+            }
+          },
+          {
+            key: {
+              text: "Date of birth"
+            },
+            value: {
+              html: dateOfBirthHtml
+            }
+          },
+          {
+            key: {
+              text: "Address"
+            },
+            value: {
+              html: "73 Roman Rd<br>Leeds<br> LS2 5ZN"
+            }
+          },
+          {
+            key: {
+              text: "NHS number"
+            },
+            value: {
+              text: data.nhsNumber
+            }
+          }
+        ]
+      }) }}
+
+      <h2 class="nhsuk-heading-m">Vaccination history</h2>
+
+
+{% set insetTextHtml %}
+  <p>This shows NHS vaccinations given in England. It includes all vaccinations recorded in RAVS but only some recorded in other systems.</p>
+
+{% endset %}
+
+{{ insetText({
+  html: insetTextHtml,
+  classes: "nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2 nhsuk-u-margin-top-2 nhsuk-u-margin-bottom-4"
+}) }}
+
+    </div>
+  </div>
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-full">
+
+        {{ table({
+          panel: false,
+          caption: "",
+          firstCellIsHeader: false,
+          head: [
+            {
+              text: "Date"
+            },
+            {
+              text: "Vaccine"
+            },
+            {
+              text: "Product"
+            }
+          ],
+          rows: [
+            [
+              {
+                text: "15 April 2025"
+              },
+              {
+                text: "COVID-19"
+              },
+              {
+                text: "Spikevax JN.1"
+              }
+            ],[
+              {
+                text: "9 November 2024"
+              },
+              {
+                text: "MMR (2nd dose)"
+              },
+              {
+                text: "Priorix"
+              }
+            ],[
+              {
+                text: "11 November 2024"
+              },
+              {
+                text: "RSV"
+              },
+              {
+                text: "Abrysvo"
+              }
+            ],
+            [
+              {
+                text: "29 October 2024"
+              },
+              {
+                text: "Pneumococcal"
+              },
+              {
+                text: "Pneumovax"
+              }
+            ],
+            [
+              {
+                text: "25 October 2024"
+              },
+              {
+                text: "Flu (1st dose)"
+              },
+              {
+                text: "Adjuvanted Quadrivalent Influenza Vaccine (aQIV)"
+              }
+            ],
+            [
+              {
+                text: "15 October 2023"
+              },
+              {
+                text: "COVID-19"
+              },
+              {
+                text: "Comirnaty 30 Omicron XBB.1.5"
+              }
+            ],
+            [
+              {
+                text: "10 October 2023"
+              },
+              {
+                text: "Flu"
+              },
+              {
+                text: "Not known",
+                classes: "nhsuk-u-secondary-text-color"
+              }
+            ],
+            [
+              {
+                text: "7 October 2023"
+              },
+              {
+                text: "Pertussis"
+              },
+              {
+                text: "Boostrix-IPV suspension"
+              }
+            ],
+            [
+              {
+                text: "11 March 2022"
+              },
+              {
+                text: "COVID-19"
+              },
+              {
+                text: "Moderna mRNA (Spikevax) Original"
+              }
+            ],
+            [
+              {
+                text: "4 December 2023"
+              },
+              {
+                text: "MMR"
+              },
+              {
+                text: "Priorix"
+              }
+            ]
+          ]
+        }) }}
+
+        {{ pagination({
+          next: {
+            href: "#"
+          },
+          items: [
+            {
+              href: "#",
+              number: 1,
+              current: true
+            },
+            {
+              href: "#",
+              number: 2
+            },
+            {
+              href: "#",
+              number: 3
+            }
+          ]
+        }) }}
+
+
+      <form action="{{ nextPage }}" method="post" novalidate>
+        {{ button({
+          text: "Continue"
+        })}}
+      </form>
+
+    </div>
+  </div>
+
+{% endblock %}
+
diff --git a/app/views/record-vaccinations/patient-history-none.html b/app/views/record-vaccinations/patient-history-none.html
index 1955fde8..d6b5b3db 100644
--- a/app/views/record-vaccinations/patient-history-none.html
+++ b/app/views/record-vaccinations/patient-history-none.html
@@ -27,6 +27,14 @@
 
       <h1 class="nhsuk-heading-l">Check Jodie Brown’s details and vaccination history</h1>
 
+      {{ warningCallout({
+        heading: "Important",
+        html: "
+        <p class='nhsuk-body'>This patient does not have a registered GP surgery.</p>
+        <p class='nhsuk-body'>We could not get any vaccination history for this patient.</p>
+         "
+      }) }}
+
       {{ summaryList({
         classes: 'xnhsuk-summary-list--no-border',
         rows: [
@@ -46,14 +54,6 @@ <h1 class="nhsuk-heading-l">Check Jodie Brown’s details and vaccination histor
               html: "15 August 1949<br>(75 years old)"
             }
           },
-          {
-            key: {
-              text: "Address"
-            },
-            value: {
-              html: "73 Roman Rd<br>Leeds<br> LS2 5ZN"
-            }
-          },
           {
             key: {
               text: "Postcode"
@@ -67,10 +67,10 @@ <h1 class="nhsuk-heading-l">Check Jodie Brown’s details and vaccination histor
 
       {% from "warning-callout/macro.njk" import warningCallout %}
 
-{{ warningCallout({
+{# {{ warningCallout({
   heading: "Important",
   text: "We could not get any vaccination history for this patient."
-}) }}
+}) }} #}
           
 
       <form action="{{ nextPage }}" method="post" novalidate>
diff --git a/app/views/record-vaccinations/patient-history.html b/app/views/record-vaccinations/patient-history.html
index 783106ad..6c01c689 100644
--- a/app/views/record-vaccinations/patient-history.html
+++ b/app/views/record-vaccinations/patient-history.html
@@ -4,7 +4,6 @@
 
 {% set currentSection = "vaccinate" %}
 
-
 {% set dateOfBirthHtml %}
   {% if data.dateOfBirth.day %}
     {{ (data.dateOfBirth | isoDateFromDateInput | govukDate) }}
@@ -43,6 +42,21 @@
 
       <h1 class="nhsuk-heading-l">Check {{ data.firstName }} {{ data.lastName }}’s details and vaccination history</h1>
 
+      {% if data.gpit === "inPCN" %}
+
+      {% set insetTextHtml %}
+      <p>This patient's GP surgery is in your PCN.</p>
+      {% endset %}
+      {{ insetText({
+        html: insetTextHtml
+      }) }}
+      {% elif data.gpit === "notInPCN" %}
+      {{ warningCallout({
+        heading: "Not in PCN",
+        text: "This patient's GP surgery is not in your PCN."
+      }) }}
+      {% endif %}
+
       {{ summaryList({
         rows: [
           {
@@ -87,6 +101,10 @@ <h1 class="nhsuk-heading-l">Check {{ data.firstName }} {{ data.lastName }}’s d
           }
         ]
       }) }}
+{# 
+      {{ insetText({
+        html: insetTextHtml
+      }) }} #}
 
       {% if data.vaccine == "COVID-19" %}