Fixed the driver system to be more consistent