update to use 'new' vcode and keyid