addressing @pxinghao comments