updated and added templates