driver changes and rebase