multiple contour driver update so that now it uses the real functions

Updated to use Olaf’s functions