moving thread safety driver onto DriverHelper again