merged in driver changes