The only thing that needs to change, because most people are averse to change, is to put a 2 vault limit on gold expenditures.