diff --git a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
index 3a28a4faea..f982934cd3 100644
--- a/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
+++ b/DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/CandidateAssessmentsDataService.cs
@@ -186,6 +186,7 @@ CandidateAssessments AS CA LEFT OUTER JOIN
                         SA.SupervisorSelfAssessmentReview,
                         SA.ReviewerCommentsLabel,
                         SA.EnforceRoleRequirementsForSignOff,
+                        SA.RetirementDate,
                         COALESCE(SA.Vocabulary, 'Capability') AS Vocabulary,
                         COUNT(C.ID) AS NumberOfCompetencies,
                         CA.StartedDate,
@@ -256,7 +257,8 @@ GROUP BY
                         CA.LaunchCount, CA.SubmittedDate, SA.LinearNavigation, SA.UseDescriptionExpanders,
                         SA.ManageOptionalCompetenciesPrompt, SA.SupervisorSelfAssessmentReview, SA.SupervisorResultsReview,
                         SA.ReviewerCommentsLabel,SA.EnforceRoleRequirementsForSignOff, SA.ManageSupervisorsDescription,CA.NonReportable,
-                        U.FirstName , U.LastName,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed, SA.IncludeLearnerDeclarationPrompt",
+                        U.FirstName , U.LastName,SA.MinimumOptionalCompetencies, CA.SelfAssessmentProcessAgreed, SA.IncludeLearnerDeclarationPrompt,
+                        SA.RetirementDate",
                 new { delegateUserId, selfAssessmentId }
             );
         }
diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
index 4f3bed409c..a63546665e 100644
--- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
+++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml
@@ -48,7 +48,7 @@
 {
     <p class="nhsuk-breadcrumb__back">
         <a class="nhsuk-breadcrumb__backlink" asp-action="SelfAssessment"
-           asp-route-selfAssessmentId="@Model.SelfAssessment.Id">
+        asp-route-selfAssessmentId="@Model.SelfAssessment.Id">
             Back to @Model.SelfAssessment.Name
         </a>
     </p>
@@ -56,6 +56,24 @@
 <h1>@Model.SelfAssessment.Name - @Model.VocabPlural()</h1>
 <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-full">
+        @if (@Model.SelfAssessment.RetirementDate!=null)
+        {
+            <div class="nhsuk-warning-callout">
+                <h2 class="nhsuk-warning-callout__label">
+                <span role="text">
+                    <span class="nhsuk-u-visually-hidden">Important: </span>
+                    New version available
+                </span>
+            </h2>
+            <div>
+                <p>A new version of this assessment is now available. As you’re already begun, you can choose what works best for you.</p>
+                <ul>
+                    <li>Continue with this version: Keep going with your current journey. Your progress will stay saved as usual.</li>
+                    <li>Start the new version: Move to the updated version if you prefer. If you switch to the newer version, you will start from the beginning (0% progress), but your progress in the current version will still be kept on your record.</li>
+                </ul>
+            </div>
+        </div>
+        }
         @if (Model.SelfAssessment.NonReportable)
         {
             <partial name="_NonReportableSelfAssessment" />
diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/ConfirmRetiringSelfAssessment.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/ConfirmRetiringSelfAssessment.cshtml
index 635bcba1e1..13763a64a1 100644
--- a/DigitalLearningSolutions.Web/Views/Supervisor/ConfirmRetiringSelfAssessment.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Supervisor/ConfirmRetiringSelfAssessment.cshtml
@@ -23,11 +23,10 @@
         <h1 class="nhsuk-u-padding-bottom-3" id="page-heading">Confirm Enrolment</h1>
         <p class="nhsuk-body-m">You are about to enrol learners on a retiring self-assessment.</p>
         <p class="nhsuk-body-m nhsuk-u-font-weight-bold">Retirement date: @Model.RetirementDate?.ToString("dd/MM/yyyy")</p>
-        <p class="nhsuk-body-m">After this date, this self-assessment will no longer be available for use.</p>
         <p class="nhsuk-body-m">Please note:</p>
         <ul>
-            <li>Learners may not have enough time to complete the self-assessment before it is retired</li>
-            <li>You may wish to consider enrolling them on an updated version, if available</li>
+            <li>once enrolled, learners can continue to complete the self-assessment even after the retirement date</li>
+            <li>you may wish to consider enrolling them on an updated version, if available</li>
         </ul>
         <p class="nhsuk-body-m">To continue, you must acknowledge that you understand the self-assessment is being retired and you still wish to proceed.</p>
         <form method="post" asp-controller="Supervisor">
diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/ConfirmRetiring.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/ConfirmRetiring.cshtml
index 3412c32fe5..1281dffc7c 100644
--- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/ConfirmRetiring.cshtml
+++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/Enrol/ConfirmRetiring.cshtml
@@ -21,11 +21,10 @@
         <h1 class="nhsuk-u-padding-bottom-3" id="page-heading">Confirm Enrolment</h1>
         <p class="nhsuk-body-m">You are about to enrol learners on a retiring self-assessment.</p>
         <p class="nhsuk-body-m nhsuk-u-font-weight-bold">Retirement date: @Model.RetirementDate?.ToString("dd/MM/yyyy")</p>
-        <p class="nhsuk-body-m">After this date, this self-assessment will no longer be available for use.</p>
         <p class="nhsuk-body-m">Please note:</p>
         <ul>
-            <li>Learners may not have enough time to complete the self-assessment before it is retired</li>
-            <li>You may wish to consider enrolling them on an updated version, if available</li>
+            <li>once enrolled, learners can continue to complete the self-assessment even after the retirement date</li>
+            <li>you may wish to consider enrolling them on an updated version, if available</li>
         </ul>
         <p class="nhsuk-body-m">To continue, you must acknowledge that you understand the self-assessment is being retired and you still wish to proceed.</p>
         <form method="post" asp-controller="Enrol">