major changes to framework