Changed some templates