Changes done by Sheng (addressing comments from WGLC)