Two more templates to move