lightly modified some templates