reverted last changes to templates