Checked in by Rudy Xiong for updating adding comments