Updated driver, state and unit