added templates2
removed templates2