Moved all previous changes to a fresh copy of the framework