Need to modify the tag too