Incorporated review comments from Roger.