Update to driver and tookit code