#17 Use the new template variable