Merging JohnCharlie changes

Merging JohnCharlie changes