finally switch to new MSM_Kernel