Added a few things to the driver