merged take2 back into baseframework