Improve driver

@hrldcpr please review