Zhe's changes