Add chenxiaolong's suggestions