Upgrade driver

Use the latest changes to the driver