Huajie's changes