Incorporated comments from John.