changes from the framework part