updated cxx driver