Tweaked the template