Updates based on John's comments.