adjustments for DRIVER_SINGLE_MODE usage
adjustments to DRIVER_SINGLE_MODE usage