diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 1ef69bac767026b69a74d9c4bf272f489fd2b1e4..4b4fcb01b1e77d2cb78d1cae31f116b4b0e688cc 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -42,34 +42,47 @@
       <div id="navbar-clear"></div>
 
     </div>
+
+{% comment %}
+FUNDRAISER VARIABLES AND CONSTANTS GUIDE
+
+fundraiser_goal_amount: The highest number of Supporters we want
+fundraiser_so_far_amount: The number of Supporters we have
+fundraiser_donation_count: The "minimum" number of Supporters we want (not currently used)
+fundraiser_donation_count_disclose_threshold: The number of Supporters that have been matched
+
+When we started the fundraiser, we had 660 Supporters matched.
+PIA will match up to 416.
+660+416==1076, so we use that constant to see if our match is done.
+{% endcomment %}
+
     <div class="fundraiser-top-text">
-{% if sitefundgoal.fundraiser_so_far_amount < sitefundgoal.fundraiser_donation_count %}
-   <em>Conservancy
-   <a href="/supporter/">needs <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters</a> to continue its basic community services &amp;
-   <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> to
-   avoid hibernating its compliance efforts in 2017.
-{% else %}
-<span id="site-fundraiser-middle-goal" style="display: none;">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span>
-      <em>Let's stand up for software freedom together!
-      We still need
-        {{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }} more Supporters to maintain our full range of activities in 2017.  Supporters who join or renew by January 15 <a href="/news/2016/nov/29/private-internet-access-2016-fundraising-match/">will count twice</a>, thanks to <a href="https://www.privateinternetaccess.com/">Private Internet Access</a>!
-{% endif %}
-{% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %}
-The <strong>next {{ 632|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold }} supporters
-who sign up <a href="/news/2016/feb/01/PIA-match-extended/">by the end of Feb. 29th (anywhere on earth) will count twice</a></strong>, thanks to <a href="https://www.privateinternetaccess.com/">Private Internet Access</a>!
-{% endif %}
-</em>
+      <em>
+        Let's stand up for software freedom together!
+        {% if sitefundgoal.fundraiser_goal_amount > (sitefundgoal.fundraiser_donation_count_disclose_threshold + sitefundgoal.fundraiser_so_far_amount) %}
+        We still need
+        {{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }}
+        more Supporters to maintain our full range of activities in 2017.
+        {% endif %}
+        {% if sitefundgoal.fundraiser_donation_count_disclose_threshold > 1076 %}
+        416 Supporters were matched
+        {% else %}
+        The next {% 1076|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|intcomma %} Supporters who join or renew by January 15 <a href="/news/2016/nov/29/private-internet-access-2016-fundraising-match/">will count twice</a>,
+        {% endif %}
+        thanks to <a href="https://www.privateinternetaccess.com/">Private Internet Access</a>!
+      </em>
 <div id="siteprogressbar">
 <a href="/supporter">
-<span id="site-fundraiser-so-far">{{ sitefundgoal.fundraiser_so_far_amount|intcomma }}</span> have joined so far.
-{% if sitefundgoal.fundraiser_so_far_amount > 750 %}
-Thus, our 750 goal was achieved &amp; {{ sitefundgoal.fundraiser_so_far_amount|subtract:750|intcomma }} have
-    joined beyond that.
-{% endif %}
-{% if sitefundgoal.fundraiser_donation_count_disclose_threshold > 0 %}
-Also, match pledges reduced our <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> maximum need by <span id="site-fundraiser-match-count">{{ sitefundgoal.fundraiser_donation_count_disclose_threshold|intcomma }}</span>
-{% endif %}
-!
+  <span id="site-fundraiser-so-far">{{ sitefundgoal.fundraiser_so_far_amount|intcomma }}</span> have joined so far.
+  <span id="site-fundraiser-match-count">{{ sitefundgoal.fundraiser_donation_count_disclose_threshold|intcomma }}</span> Supporters have been matched.
+  {% if sitefundgoal.fundraiser_goal_amount > (sitefundgoal.fundraiser_donation_count_disclose_threshold + sitefundgoal.fundraiser_so_far_amount) %}
+  We still need
+  {{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }}
+  more Supporters to reach
+  {% else %}
+  That means we reached
+  {% endif %}
+  our goal of <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span>.
 </a>
 </div>
 </div>