Better handling for goal reached state