Integrating new doc changes from Steven.