Merged in Chris's changes.