corrected for @user.goal == nil