After getting confirmation from Guenther, add 3 changes we'll ultimately need to...