Apply new framework and them changes