Handling funding/pledges much better