Second Pass on reviews by mengxr