changes to framework and templates