Update for kk_3.5