Driver tweaks

functions were tweaked, so the function calls need to be tweaked