final changes to framework