Updating recalculation to be based on <= funding date instead of <