[jh] further changes for CHINA