Now that both Yang and UBI are back in the headlines, I have an idea that could really improve it.
Poor people buy necessities: food, a car, bills. Non-poor people buy HHE: houses, healthcare, education.
I know no politician would dare suggest it, but I wonder what @robinhanson and @bryan_caplan would think.