diff --git a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
index 796485b3..944ffdf2 100644
--- a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
+++ b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
@@ -1,19 +1,19 @@
 {% load humanize %}
 
-{% if sitefundgoal1.days_remaining >= -22 or sitefundgoal0.days_remaining >= -22  %}{# i.e. 7 days over completion #}
+{% if sitefundgoal1.days_remaining >= -22 or sitefundgoal0.days_remaining >= -22  %} {# IF LEVEL 0 (only show this at all for 7 days after fundraiser and stretch are over) #}
   <div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns">
     <div class="mw8 center ph2 ph4-ns">
       <div class="mt2 mb3 tc">
-        {% if sitefundgoal0.match_remaining <= 0 %}
-          {% if sitefundgoal1.days_remaining >= 0 %}
-                {% if sitefundgoal1.match_remaining <= 0 %}
+  {% if sitefundgoal0.match_remaining <= 0 %}  {# LEVEL 1 #}
+    {% if sitefundgoal1.days_remaining >= 0 %} {# LEVEL 2.0 #}
+                {% if sitefundgoal1.match_remaining <= 0 %} {# LEFT OFF HERE #}
                           Thanks to so many donors, we earned our full original match donation &mdash; <em>as well as</em> our <strong>extended</strong> match!
                           Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>!
                 {% else %}
                      Thanks to so many donors, we met <em>our largest match donation ever of <strong>$211,939</strong>.
                      A generous anonymous donor has provided <em>another $40,000</em> of matching funds. 
                      <a href="https://sfconservancy.org/sustainer/">Give now to help us</a> reach this stretch goal!<br/>
-                {% endif %}
+                OLD_ENDIF
             {% if sitefundgoal1.days_remaining == 0 %}
               For the <strongly>only</strong> the next {{ sitefundgoal1.hours_remaining }} hour{{ sitefundgoal1.hours_remaining|pluralize }}, the
             {% elif sitefundgoal1.days_remaining == 1 %}
@@ -22,15 +22,13 @@
               For only {{ sitefundgoal1.days_remaining }} more days, the
             {% else %}
               Until FIXME_DATE, the
-            {% endif %}
+            OLD_ENDIF
             next <b>${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }}</b> of <a href="/sustainer/">support we receive</a> will be matched!
-          {% endif %}
-        {% else %}
+          OLD_ENDIF
+    {% else %} {# ELSE LEVEL 2.0 when (sitefundgoal1.days_remaining < 0) #}
               Thanks to all our donors who participated in our
           historic donation match challenge!  Thanks to you, we raised our goal of <b>$503,878</b> to support software freedom:
-        {% endif %}
-      </div>
-
+    {% endif %}  {# ENDIF LEVEL 2.0 (whether or not there are any sitefundgoal1.days_remaining) #}
       <a href="/sustainer/" style="text-decoration: none !important">
         <div id="siteprogressbar" class="flex items-stretch w-100">
           {% if sitefundgoal1.match_remaining <= 0 %}
@@ -47,13 +45,30 @@
             <div class="final-goal pv1 b flex items-center" style="flex-basis: {{ sitefundgoal1.match_remaining }}px">
               <span id="site-fundraiser-final-goal" class="goalText tc w-100 ph1">${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }} to go!</span>
             </div>
-          {% endif %}
+        </div>
+      <a href="/sustainer/" style="text-decoration: none !important">
+        <div id="siteprogressbar" class="flex items-stretch w-100">
+          {% if sitefundgoal0.match_remaining <= 0 %}
+            <div class="progress matched ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">
+              <span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1">${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
+            </div>
+            <div class="progress exceeded pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_exceeded_by }}px">
+              <span id="site-fundraiser-match-count" class="soFarText tc w-100 exceeded ph1">${{sitefundgoal0.match_exceeded_by|floatformat:0|intcomma }} additional<br> raised!<br></span>
+            </div>
+          {% else %}
+            <div class="progress ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">
+              <span id="site-fundraiser-match-count" class="soFarText tc w-100">${{ sitefundgoal0.fundraiser_so_far_amount|floatformat:0|intcomma }} matched!</span>
+            </div>
+            <div class="final-goal pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_remaining }}px">
+              <span id="site-fundraiser-final-goal" class="goalText tc w-100 ph1">${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go!</span>
+            </div>
+          OLD_ENDIF
         </div>
       </a>
     </div>
+
   </div>
-{% else %}
-{% if sitefundgoal0.match_remaining > 0 %}
+{% else %} {# ELSE LEVEL 1 when (sitefundgoal0.match_remaining > 0) #}
   <div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns">
     <div class="mw8 center ph2 ph4-ns">
       <div class="mt2 mb3 tc">
@@ -70,14 +85,14 @@
               Help us reach our goal of <b>$503,878</b> this season to keep SFC going.  For only {{ sitefundgoal0.days_remaining }} more days, the
             {% else %}
               Help us reach our goal of <b>$503,878</b> this season to keep SFC going.  Until January 15, the
-            {% endif %}
+            OLD_ENDIF
             next <b>${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }}</b> of <a href="/sustainer/">support we receive</a> will be matched!
-          {% endif %}
+          OLD_ENDIF
         {% else %}
           Thanks to all our donors who participated in our
           historic donation match challenge!  Thanks to you, <a href="https://sfconservancy.org/blog/2025/jan/16/end-of-year-2024-fundraiser-a-massive-success/">we
           raised more than $480k to support software freedom</a>:
-        {% endif %}
+        OLD_ENDIF
       </div>
 
       <a href="/sustainer/" style="text-decoration: none !important">
@@ -96,9 +111,9 @@
             <div class="final-goal pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_remaining }}px">
               <span id="site-fundraiser-final-goal" class="goalText tc w-100 ph1">${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go!</span>
             </div>
-          {% endif %}
+  {% endif %} {# ENDIF LEVEL 1, two choices for based on sitefundgoal0.match_remaining #}
         </div>
       </a>
     </div>
   </div>
-{% endif %}
+{% endif %} {# ENDIF LEVEL 0 (the fundraiser has been over for > 7 days) #}