Add comments from Haiyong Zheng