changes make class work with driver3