first batch of changes to reconcile with new driver-based paradigm