Pulled in new Code from Bryce

BASELINE