update from wiki_ki