Added some driving logic