An Improved Whole Life Satisfaction Theory of Happiness · Study