All ready for new driver with split keys