added diagnostics to driver