added more to the framework