modified some templates