Updated driver layout