hi2uc refact