Checkked in by Rudy Xiong for enhancing comments