Redo all with templates