Added Fency Commetns
More template tag updating