v1.15 rhetorical changes take 2