Changes based on shimingfei's review comments