removed concat
added templates