renamed template, added tags