Merged my changes with upstream changes from Joe.