bringing framework up to latest