swapped in new template