Improved the template