HK refactor.