Improved The Template