Improved template