changed templates a bit