[Yhc] merging nhc98 and yhc