Added improved Template