Changed the driving logic a bit