Update based on Jason's feedback.