Minor changes to driver.

Driver still does not work.