update and added templates