removed happiness
updated schedule