Merged Chao's commit