Incorporated review comments from Bernard.