Incorporated comments by Lei.