Many changes and additions related to the new budget versions scenario.