re-added templates