Update to new kk sources