Update based on John's feedback