1/2-way through 2nd set of changes per John