reorganize, add HII