Framework

More framework updates
updates