Implement feedback from @qiangxue