Incorporated review comments from RMS.