upgrade to newer cargo implementation