Merging Jeff's changes.