Merged in Kelly's text changes.