Included all JJ's comments.