Integrated JohnJ's feedback.