changed templates little