tweak to line up with vitek changes
some standardisation and deprecated function call replacement