Changed follow up to use existing templates