Checked in by Rudy Xiong for Adding Comments