Updated how happiness is calculated