Generalizing the Permanent-Income Hypothesis: Revisiting Friedman's Conjecture on Consumption