Incorporated review comments into driver.