Hao Add more changes