Chris

Merge Chris's changes with master.