Hao's commit