Some adjustments based on John's feedback/questions.