Added back template select