added more to framework