Improve make_change