some edits to framework