Tempalate improved