Changes at the template