Replace Arne to Hubert. Rollback some changes original designed for baidu certification