Remove dummy code and add tag name