More high-level changes.