Updated driver code