Getting more stuff ready for changes.