A few changes to the framework.