Made some major changes throughout the framework