diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
index 9ab7ed908..ae2108057 100644
--- a/.github/workflows/phpunit.yml
+++ b/.github/workflows/phpunit.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        civicrm-image-tags: [ '5-drupal', '5.72-drupal-php8.0' ]
+        civicrm-image-tags: [ '5-drupal', '5.80-drupal-php8.1' ]
     name: PHPUnit with Docker image michaelmcandrew/civicrm:${{ matrix.civicrm-image-tags }}
     env:
       CIVICRM_IMAGE_TAG: ${{ matrix.civicrm-image-tags }}
diff --git a/ci/composer.json b/ci/composer.json
index 6ec244035..eadc95384 100644
--- a/ci/composer.json
+++ b/ci/composer.json
@@ -10,6 +10,6 @@
         "sort-packages": true
     },
     "require": {
-        "civicrm/civicrm-core": "^5.72"
+        "civicrm/civicrm-core": "^5.80"
     }
 }
diff --git a/info.xml b/info.xml
index f08847092..ba5dfeab6 100644
--- a/info.xml
+++ b/info.xml
@@ -14,11 +14,11 @@
     <url desc="Support">https://github.com/systopia/funding/issues</url>
     <url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
-  <releaseDate></releaseDate>
+  <releaseDate/>
   <version>0.17-dev</version>
   <develStage>dev</develStage>
   <compatibility>
-    <ver>5.72</ver>
+    <ver>5.80</ver>
   </compatibility>
   <comments/>
   <requires>
diff --git a/managed/SavedSearch_Drawdowns_by_Recipient_and_Funding_Program.mgd.php b/managed/SavedSearch_Drawdowns_by_Recipient_and_Funding_Program.mgd.php
index 925ae7d64..4b008eb58 100644
--- a/managed/SavedSearch_Drawdowns_by_Recipient_and_Funding_Program.mgd.php
+++ b/managed/SavedSearch_Drawdowns_by_Recipient_and_Funding_Program.mgd.php
@@ -137,6 +137,15 @@
               'tally' => [
                 'fn' => 'SUM',
               ],
+              'rewrite' => '',
+            ],
+            [
+              'type' => 'field',
+              'key' => 'COUNT_id',
+              'dataType' => 'Integer',
+              'label' => E::ts('Withdrawable Funds'),
+              'sortable' => TRUE,
+              'rewrite' => '{($SUM_amount_approved - $SUM_FundingCase_FundingPayoutProcess_funding_case_id_01_FundingPayoutProcess_FundingDrawdown_payout_process_id_01_amount_paid_out)|crmMoney:$currency}',
             ],
             [
               'type' => 'field',