finished the framework changes from last commit