added prefix @ to template variables