Rework driver logic, changing timeouts