more adjustment of the templates