update from kk_2.7