Addressed Ms2ger's review comments.