Changed the way to manipulate the tags