changed templates too