new framework_base branch