Updates to Headwaters