changes to the template and framework