Merged back in my changes.