Apply Jim's feedback
Apply Jim's feedback.