switch to new KMF