[19] some changes with the template