Headwaters changes