more changes, framework up