added template tags
added @ tag