move to kk

and few other changes