accommodate review comments