More work on the budget controller [skip ci]