Changed templates and