Incorporated review comments