Updated to next branch of driver