Driver improvement

I removed branch and created new.