edited for framework_base