Updated for template