Changes to accomodate new driver function