a little rework for driver pipeline