Re-wiring search for drivers.  Not working currently.